打印单

src/api/stock.js

@@ -574,4 +574,13 @@ export function PostSearchStock(keyword,params){
     method:"get",
     params:params
   })
+}
+
+export function GetOutStockTotalCount(params){
+  
+  return request({
+    url:"/api/warehouseout/getoutstocktotalcount",
+    method:"get",
+    params:params
+  })
 }

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

@@ -289,15 +289,6 @@
                 <el-option label="是" value="1"></el-option>
                 <el-option label="否" value="2"></el-option>
               </el-select>
-
-             <!-- <el-select v-model="assessmentBeforeDislysis.is_hemorrhage" placeholder="请选择">
-                <el-option
-                  v-for="item in hemorrhages"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select> -->
             </el-form-item>
           </el-col>
 
@@ -525,34 +516,36 @@
             </el-form-item>
           </el-col>
 
+         
 
+          <el-col :span="8">
+            <el-form-item label="血栓：" v-if="isShow('血栓')">
+              <el-select v-model="assessmentBeforeDislysis.thromubus_type" @change="changeThrombus">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option label="有" value="1"></el-option>
+                <el-option label="无" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
+          <el-col :span="8">
+            <el-form-item label="导管AV端(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thrombus_av" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
 
+          <el-col :span="8">
+            <el-form-item label="导管A端(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_a" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
 
-
-
-
-
-
-
-
-
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-          <!--<el-col :span="8">-->
-          <!--<el-form-item label="穿刺方法： " v-if="isShow('穿刺方法')">-->
-
-          <!--<el-select v-model="assessmentBeforeDislysis.puncture_method">-->
-          <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--<el-option v-for="item in puncture_method" :label="item.name" :value="item.name"-->
-          <!--:key="item.id"></el-option>-->
-          <!--</el-select>-->
-
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-
+          <el-col :span="8">
+            <el-form-item label="导管V端(cm):" v-show="thrombuShow">
+              <el-input v-model="assessmentBeforeDislysis.thromubus_v" style="width:150px"></el-input>
+            </el-form-item>
+          </el-col>
+      
         </el-row>
 
 
@@ -704,6 +697,11 @@
           edema:'',
           special_treatment:'',
           catheter_maintenance:"",
+          thromubus_type:"",
+          thrombus_av:"",
+          thromubus_a:"",
+          thromubus_v:""
+
         },
 
         InnerDialogProps: {
@@ -718,7 +716,8 @@
         puncture_ways: '',
         skins:[],
         pinholings:[],
-        catheter_maintenancelist:[]
+        catheter_maintenancelist:[],
+        thrombuShow:false
       }
     },
     props: {
@@ -759,6 +758,11 @@
       },
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
         this.lastPredialysisEvaluation = last_predialysis_evaluation
+        if(this.lastPredialysisEvaluation.thromubus_type == 1){
+          this.assessmentBeforeDislysis.thromubus_type = this.lastPredialysisEvaluation.thromubus_type.toString()
+           this.thrombuShow = true
+        }
+        console.log("获取上次数据",this.lastPredialysisEvaluation)
         if(this.lastPredialysisEvaluation != null) {
           if (this.lastPredialysisEvaluation.is_hemorrhage == 1) {
             this.lastPredialysisEvaluation.is_hemorrhage = "1"
@@ -1189,6 +1193,15 @@
             }
           }
         })
+      },
+
+      changeThrombus(val){
+        if(val == 1){
+          this.thrombuShow = true
+        }
+        if(val == 2){
+         this.thrombuShow = false
+        }
       }
     },
     created() {
@@ -1221,6 +1234,7 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
+     
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

src/xt_pages/dialysis/details/index.vue

@@ -971,7 +971,7 @@ export default {
         if (resp.state == 1) {
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
-          console.log("患者排班信息99999999",schedual)
+          // console.log("患者排班信息99999999",schedual)
           var prescription = resp.data.prescription // 透析处方
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
@@ -983,7 +983,8 @@ export default {
           var receiver_treatment_access = resp.data.receiver_treatment_access // 接诊评估
           // console.log('receiver_treatment_access', receiver_treatment_access)
           var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
-          // console.log('透前评估22222', predialysis_evaluation)
+         
+        
 
           if (predialysis_evaluation != null) {
             if (predialysis_evaluation.blood_access_part_id == -2) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -33,7 +33,7 @@
           </div>
         </div>
         <div class="inline_block" style="margin-right:10px;">
-          性别&nbsp;&nbsp;&nbsp;&nbsp;
+          性别&nbsp;
           <label-box :isChecked="patientInfo.gender == '男'" showValue="男" ></label-box>&nbsp;
           <label-box :isChecked="patientInfo.gender == '女'" showValue="女" ></label-box>
         </div>
@@ -402,7 +402,7 @@
 
       <table class="print-table" border="1">
         <tbody>
-            <tr style="height:40px;line-height:40px">
+            <tr style="line-height:20px;">
               <td width="60">时间</td>
               <td width="60">BP</td>
               <td width="40">心率</td>
@@ -447,7 +447,7 @@
         <tbody>
           <tr style="height:30px;line-height:30px">
             <td width="70" rowspan="3" style="padding-left:5px;border:none;border-right:1px solid #000;">
-              透后评估
+              透后小结
             </td>
 
             <td width="25" style="border:none;padding-left:5px;">
@@ -554,23 +554,30 @@
       </table>
 
       <table class="print-table" border="1">
-        <tr style="height:36px;text-align:left;border:none;">
+        <tr style="line-height:25px;text-align:left;border:none;">
           <td style="padding-left:5px;border:none">
-              <p style="margin-bottom:30px">
+              <div style="padding-bottom:10px;">
                 透析小结：{{ summary.dialysis_summary ? summary.dialysis_summary : "" }}
-              </p>
+              </div>
+          </td>
+        </tr>
+        <tr style="line-height:25px;text-align:left;border:none;">
+          <td style="padding-left:5px;border:none">
+              <div style="padding-bottom:10px;">
+                病情记录：{{ summary.special_record ? summary.special_record : "" }}
+              </div>
           </td>
         </tr>
         <tr style="height:40px">
           <td rowspan="11" style="border:none;text-align:right;height:40px">
-            记录者
+            护士签名
             <span style="display: inline-block;width:100px;text-align: left;">
                 <span v-if="orderForm.url === ''" style="display:flex;align-items:center;">{{ orderForm.start_nurse }}</span>
                 <span v-if="orderForm.url !== ''" style="display:flex;align-items:center;height:36px;">
                     <img :src="orderForm.url" style="height:30px;" />
                 </span>
             </span>
-            二核护士
+            <!-- 二核护士
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
               <span v-if="dialysisOrder ? dialysisOrder.start_nurse != check.modifier : false">
@@ -584,7 +591,7 @@
               {{ getAdminUser(check == null ? 0 : check.creater) }}
               </span>
               <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
-            </span>
+            </span> -->
             </span>
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -65,7 +65,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
       const style =
-        '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;}}';
+        '@media print {.statementTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';
         printJS({
             printable: "statement-print",
             type: "html",
@@ -150,7 +150,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+      if (this.$store.getters.xt_user.org_id == 4) {
 
         var that = this
 

src/xt_pages/stock/drugs/query.vue

@@ -2,42 +2,77 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
-      <el-button
-        size="small"
-        class="filter-item"
-        type="primary"
-        icon="el-icon-search"
-        @click="setting"
-      >设置
-      </el-button
-      >
-     <!-- <el-button
-        size="small"
-        class="filter-item"
-        type="primary"
-        icon="el-icon-search"
-        @click="exportStock"
-      >导出
-      </el-button> -->
-    </div>
-    <div class="app-container ">
-      <div class="cell clearfix">
-        <el-input
-          size="small"
-          style="width: 400px;"
-          class="filter-item"
-          v-model.trim="keywords"
-          placeholder="商品名称/规格名称"
-        />
+      <div>
         <el-button
           size="small"
           class="filter-item"
           type="primary"
           icon="el-icon-search"
-          @click="search"
-        >搜索
+          @click="setting"
+        >设置
         </el-button
         >
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="exportStock"
+        >导出
+        </el-button>
+      </div>
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+         <el-select v-model="drug_category" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+            <el-option
+              v-for="(item,index) in drugCategory"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+        </el-select>
+         <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;margin-right:10px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+          <el-input
+            size="small"
+            style="width: 200px;"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="商品名称/规格名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+          >搜索
+          </el-button>
       </div>
 
 
@@ -121,7 +156,7 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100]"
+        :page-sizes="[10, 50, 100,500,1000]"
         :page-size="10"
         background
         align="right"
@@ -144,11 +179,15 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getAllDrugStockQueryList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
-
+  import { getDictionaryDataConfig } from "@/utils/data";
   export default {
     name: 'stockIn',
     created() {
       this.GetAllDrugStockQueryList()
+
+      var drugCategory = getDictionaryDataConfig('system','drug_category')
+      this.drugCategory.push(...drugCategory)
+      console.log("透析记录",this.drugCategory)
     },
     components: {
       SettingDialog,
@@ -176,7 +215,11 @@
           loading: false,
           warehouseInfoDate: []
         },
-        tableData:[]
+        tableData:[],
+        drug_category:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ]
       }
     },
     methods: {
@@ -227,12 +270,16 @@
         }
       },
       GetAllDrugStockQueryList: function() {
-        console.log(this.keywords)
+       
         const Params = {
           page: this.page,
           limit: this.limit,
-          keyword: this.keywords
+          keyword: this.keywords,
+          drug_category:this.drug_category,
+          start_time:this.start_time,
+          end_time:this.end_time,
         }
+        console.log("parasm22222",Params)
         this.WarehouseInfo.loading = true
         this.WarehouseInfo.warehouseInfoDate = []
         getAllDrugStockQueryList(Params).then(response => {
@@ -251,9 +298,17 @@
               arr.push(response.data.data.list[i])
             }
             console.log("数据源头",arr)
-            // for(let i=0;i<arr.length;i++){
-            //    arr[i].stockInCount = 
-            // }
+            for(let i=0;i<arr.length;i++){
+               arr[i].stockInCount =  this.stockInCount(arr[i])
+               arr[i].salesReturnCount = this.salesReturnCount(arr[i])
+               arr[i].reactCount = (this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]))?this.stockInCount(arr[i]) - this.salesReturnCount(arr[i]):0
+               arr[i].stockOutCount = this.stockOutCount(arr[i])
+               arr[i].cancelStockCount = this.cancelStockCount(arr[i])?this.cancelStockCount(arr[i]):0
+               arr[i].reactOutCount = (this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i]))?(this.stockOutCount(arr[i]) - this.cancelStockCount(arr[i])):0
+               arr[i].overplusCount = (this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]))?this.stockInCount(arr[i])-this.salesReturnCount(arr[i])-this.stockOutCount(arr[i])+this.cancelStockCount(arr[i]):0
+            }
+             console.log("arr222222222",arr)
+             this.tableData = arr
             this.handleSpanTempArr()
           }
         })
@@ -291,12 +346,27 @@
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
-      startTimeChange: function() {
-        this.GetAllDrugStockQueryList()
-      },
-      endTimeChange: function() {
-        this.GetAllDrugStockQueryList()
-      },
+  
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+    },
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+     
+    },
       stockInCount: function(row) {
         let total = 0
         for (let i = 0; i < row.query_drug_warehousing_info.length; i++) {
@@ -337,31 +407,38 @@
       },
       search: function() {
         this.GetAllDrugStockQueryList()
-      }, setting: function() {
+      }, 
+      setting: function() {
         this.$refs.dialog.show()
       },
-      //  exportStock(){
-      //    import('@/vendor/Export2Excel').then(excel => {
-      //    const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退货','实际出库','剩余库存']
-      //    const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','Total','Count','margin','margin']
-      //   //  for(let i=0;i<this.tableData.length;i++){
-      //   //     this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
-      //   //  }
+       exportStock(){
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
+         const filterVal = ['drug_name', 'drug_spec', 'stockInCount','salesReturnCount','reactCount','stockOutCount','cancelStockCount','reactOutCount','overplusCount']
+       
         
-      //    const data = this.formatJson(filterVal, this.tableData)
+         const data = this.formatJson(filterVal, this.tableData)
       
-      //    excel.export_json_to_excel({
-      //      header: tHeader,
-      //      data,
-      //      filename: '自备药查询'
-      //    })
-      //     this.downloadLoading = false
-      //   })
-      //  },
-      //  formatJson(filterVal, jsonData) {
-      //   return jsonData.map(v => filterVal.map(j => v[j]));
-      // },
-
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '自备药查询'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+      },
+      getTimestamp(time) { // 把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
+      changeDrug(){
+       this.GetAllDrugStockQueryList()
+      }
     }
   }
 </script>

src/xt_pages/stock/stockOutOrder.vue

@@ -132,7 +132,7 @@
                 size="small"
                 type="warning"
                 icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
+                @click="handleSearch(scope.row.id,scope.row)"
               >
               </el-button>
             </el-tooltip>
@@ -259,8 +259,8 @@
                 <span>出库数量</span>
               </template>
               <template slot-scope="scope">
-                <span>{{scope.row.count}}</span>
-
+                <!-- <span>{{scope.row.count}}</span> -->
+                <span>{{getOutStockCount(scope.row.good_id)}}</span>
               </template>
             </el-table-column>
             <el-table-column label="总价" min-width="20" align="center">
@@ -383,7 +383,8 @@ import {
   GetAllConfig,
   getWarehouseOutList,
   getWarehouseOutInfo,
-  getWarehouseOutUser
+  getWarehouseOutUser,
+  GetOutStockTotalCount
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 
@@ -452,7 +453,7 @@ export default {
       userList:[],
       type_name:'',
       specification_name:"",
-      
+      stockCount:[]
     };
   },
   methods: {
@@ -607,9 +608,10 @@ export default {
       }
     },
     handleEdit: function(index, row) {
+      
       this.$router.push({
         name: "stockOutDetail",
-        query: { id: row.id, type: this.type }
+        query: { id: row.id, type: this.type,warehouse_out_time:row.warehouse_out_time }
       });
     },
     handleDelete: function(index, row) {
@@ -708,11 +710,13 @@ export default {
 
     
     //新增
-    handleSearch(id){ 
+    handleSearch(id,row){ 
+      console.log("row2233r5",row)
       this.warehousingOutInfo.info = []
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetailOne(id)
-      this.dialogVisible = true
+      this.GetTotalCount(row.warehouse_out_time)
+      
     },
   
     //获取出库单详情数据
@@ -790,11 +794,13 @@ export default {
             return false
           } else {
             var total = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              var obj = response.data.data.list[i]
+            var list = response.data.data.list
+            var arrList =  this.unique(list)
+            for (let i = 0; i < arrList.length; i++) {
+              var obj = arrList[i]
               obj['is_total'] = 0
               this.userList.push(obj)
-              total = total + response.data.data.list[i].count
+              total = total + arrList[i].count
             }
             this.userList.push({
               is_total: 1,
@@ -803,7 +809,7 @@ export default {
             this.type_name = this.userList[0].type.type_name
             this.specification_name = this.userList[0].info.specification_name
             console.log("详情数据区",this.userList)
-              this.editdialogVisible = true
+            this.editdialogVisible = true
           }
         })
       },
@@ -813,7 +819,36 @@ export default {
       },
       deleteRecord(){
 
-      }
+      },
+
+      GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("出库数量2323",stockCount)
+              this.stockCount = stockCount
+              this.dialogVisible = true
+           }
+        })
+      },
+
+     getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
+     },
+
+     unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
+     }
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -74,8 +74,8 @@
               <span>出库数量</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.count}}</span>
-
+              <!-- <span>{{scope.row.count}}</span> -->
+                <span>{{getOutStockCount(scope.row.good_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">
@@ -112,7 +112,7 @@
 
 <script>
   import { uParseTime } from '@/utils/tools'
-  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutInfo } from '@/api/stock'
+  import { deleteWarehouseOut, GetAllConfig, getWarehouseOutInfo,GetOutStockTotalCount } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
   export default {
@@ -120,8 +120,11 @@
     components: { BreadCrumb },
     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)
     },
     data() {
       return {
@@ -149,7 +152,8 @@
           loading: false,
           warehousingOutData: [],
           info: {}
-        }
+        },
+        stockCount:[]
       }
     },
     methods: {
@@ -221,12 +225,12 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log("=====",response.data.data.list)
-            console.log("=11111",response.data.data.info)
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+            console.log("数据源头9999999999",this.warehousingOutInfo.warehousingOutData)
             this.handleSpanTempArr()
           }
         })
@@ -263,7 +267,8 @@
         })
       }, editRecord: function() {
         this.$emit('edit-record')
-      },jump(row){
+      },
+      jump(row){
         this.$router.push({
           name: 'user_detail',
           query: { id: row.id }
@@ -277,7 +282,8 @@
             colspan: _col
           }
         }
-      },handleSpanTempArr(){
+      },
+      handleSpanTempArr(){
         this.tempArr = []
 
         for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
@@ -311,9 +317,29 @@
           }
         })
         this.sameRowArr = sameRowArr
+      },
 
+      GetTotalCount(time){
+          var params = {
+           warehouse_out_time:time
+          }
+        GetOutStockTotalCount(params).then(response=>{
+           if(response.data.state == 1){
+              var stockCount = response.data.data.stockCount
+              console.log("stockCount",stockCount)
+              this.stockCount = stockCount
+           }
+        })
+      },
 
-
+      getOutStockCount(id){
+         var count = 0 
+         for(let i=0;i<this.stockCount.length;i++){
+            if(id == this.stockCount[i].good_id){
+              count = this.stockCount[i].count
+            }
+         }
+         return count
       }
     }
   }

src/xt_pages/stock/stockQuery.vue

@@ -345,7 +345,7 @@ export default {
       return total;
     },
     stockOutCount: function(row) {
-      console.log("row------",row)
+      
       let total = 0;
       for (let i = 0; i < row.query_warehouseout_info.length; i++) {
         total = total + row.query_warehouseout_info[i].count;

src/xt_pages/stock/stockUserDetail.vue

@@ -117,20 +117,27 @@
             return false
           } else {
             var total = 0
-            for (let i = 0; i < response.data.data.list.length; i++) {
-              var obj = response.data.data.list[i]
+          
+            var list =  response.data.data.list
+            console.log("list",list)
+            var arrList = this.unique(list)
+            for (let i = 0; i < arrList.length; i++) {
+              var obj = arrList[i]
               obj['is_total'] = 0
               this.userList.push(obj)
-              total = total + response.data.data.list[i].count
+              total = total + arrList[i].count
             }
             this.userList.push({
               is_total: 1,
               total: total,
             })
-
-            console.log(this.userList)
           }
         })
+      },
+
+      unique(arr) {
+        const res = new Map();
+        return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
       }
     }
   }