8月15日

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -139,7 +139,7 @@
       <span>
         <div class="cell clearfix">
           <label class="title"> <span class="name">排班班次</span> : </label>
-           <el-select v-model="schedulType" placeholder="请选择">
+           <el-select v-model="schedule_type" placeholder="请选择">
             <el-option
               v-for="item in schedulArr"
               :key="item.value"
@@ -148,7 +148,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partitionType" placeholder="请选择">
+           <el-select v-model="partion_type" placeholder="请选择">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -166,23 +166,23 @@
           color: '#606266'
         }"
       >
-         <el-table-column  align="center" width="55" label="序号">
+         <el-table-column  align="center"  label="序号">
            <template slot-scope="scope">
             
            </template>
         </el-table-column>
-        <el-table-column  align="center"  width="55" label="耗材名称">
+        <el-table-column  align="center"   label="耗材名称">
          <template slot-scope="scope">
            
            </template>
         </el-table-column>
-        <el-table-column  align="center"  width="55" label="规格">
+        <el-table-column  align="center"  label="规格">
            <template slot-scope="scope">
           
            </template>
         </el-table-column>
        
-        <el-table-column  align="center"  width="55" label="数量">
+        <el-table-column  align="center"   label="数量">
            <template slot-scope="scope">
           
            </template>
@@ -193,8 +193,8 @@
       </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+        <el-button @click="startDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="startDialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -203,7 +203,7 @@
 
 
 <script>
-  import { GetAllZone,getPatientDialysisSolutionGroupList } from '@/api/dialysis'
+  import { GetAllZone,getPatientDialysisSolutionGroupList,getDialysisGoodTotalCount } from '@/api/dialysis'
 
   import { uParseTime } from "@/utils/tools";
   import { getDataConfig } from '@/utils/data'
@@ -269,6 +269,8 @@
         hemodialysisPipelinesOptions:[],
         startDialogVisible:false,
         tableList:[],
+        schedule_type:"",
+        partion_type:"",
       }
     },
     created() {
@@ -386,7 +388,20 @@
         })
       },
       statistics() {
-        this.startDialogVisible = true
+        var params = {
+          schedule_type:this.schedule_type,
+          partion_type:this.partion_type,
+          selected_date:this.query.schedule_date,
+        }
+        console.log("params2332232wo",params)
+       getDialysisGoodTotalCount(params).then(response=>{
+          if(response.data.state == 1){
+            this.startDialogVisible = true
+            var list = response.data.data.list
+            console.log("list232323223222wid",list)
+          }
+       })
+        
       },
       handleScheduleDateChange(val) {
         this.query.schedule_date = val
@@ -441,7 +456,7 @@
           
         }
         if(filed_name_cn == "目标超滤量"){
-          return ""
+          return val.target_ultrafiltration
         }
         if(filed_name_cn == "透析液配方"){
           return this.getDialysateFormulation(val.dialysate_formulation)

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -84,24 +84,13 @@
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
           <div v-if="org_id == 10340 || org_id == 0">
-<!--                        <el-button size="small"-->
-<!--                                   @click="openZb(1)"-->
-<!--                                   type="primary">登记-->
-<!--                        </el-button>-->
-
                         <el-button  size="small"
                                    @click="openZb(4)"
-                                   type="primary">记账
+                                   v-if=" this.order.id == 0"
+                          type="primary">记账
                         </el-button>
-
-<!--                        <el-button   size="small"-->
-<!--                                   @click="openZb(3)"-->
-<!--                                   type="primary">撤销记账-->
-<!--                        </el-button>-->
-
           </div>
 
-
           <div  v-if="org_id != 10340 || org_id != 0">
 <!--            <el-button size="small"-->
 <!--                       @click="openZb(1)"-->

src/xt_pages/outpatientCharges/summary.vue

@@ -1499,6 +1499,7 @@ export default {
             for (let i = 0; i < med_chrgitm_types.length; i++) {
               let price = 0
               let obj = {
+                number:"440722196501072316",
                 name: order.patient.name,
                 idNo: order.patient.id_card_no,
                 med_chrgitm_name:this.getType(med_chrgitm_types[i]),
@@ -1525,9 +1526,10 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "姓名": list[i].name,
+              "购方名称": list[i].name,
+              "购方纳税人识别号":list[i].number,
               "身份证":  list[i].idNo,
-              "收费项目": list[i].med_chrgitm_name,
+              "商品名称": list[i].med_chrgitm_name,
               "金额": list[i].price,
               "备注": list[i].remark,
 
@@ -1537,16 +1539,18 @@ export default {
 
           import("@/vendor/Export2Excel").then((excel) => {
             const tHeader = [
-              "姓名",
+              "购方名称",
+              "购方纳税人识别号",
               "身份证",
-              "收费项目",
+              "商品名称",
               "金额",
               "备注",
             ];
             const filterVal = [
-              "姓名",
+              "购方名称",
+              "购方纳税人识别号",
               "身份证",
-              "收费项目",
+              "商品名称",
               "金额",
               "备注",
             ];

src/xt_pages/stock/query/purchaseStockQuery.vue

@@ -667,7 +667,7 @@ export default {
     this.goodTypeList= []
     this.getStorehouseList()
     this.getlist()
-    this.getStockDrugCount()
+    //this.getStockDrugCount()
    },
    getWarehouseInfoStartPrice(arr,arr1,arr2,arr3,arr4){
      var total_price = 0

src/xt_pages/stock/stockOutOrder.vue

@@ -1416,10 +1416,10 @@ export default {
                 list[i].child.push(this.flowList[j])
               }
             }
-         
+           
             this.tableList.push(list[i]);
           }
-         
+          console.log("tablielist2332323",this.tableList)
         }
       });
     },
@@ -1900,9 +1900,12 @@ export default {
             if(newArr!=null && newArr.length > 0){
               for(let i=0;i<newArr.length;i++){
                for(let j=0;j<cancelInfo.length;j++){
-                 if(newArr[i].patient_id == cancelInfo[j].patient_id){
+                if(cancelInfo[j].patient_id > 0){
+                  if(newArr[i].patient_id == cancelInfo[j].patient_id){
                     newArr[i].child.push(cancelInfo[j])
                  }
+                }
+               
                }
               }
             }
@@ -1924,7 +1927,7 @@ export default {
           console.log("2o32o3o3232j32oo23o2332oj2wo",arr)
           var arrTwo= []
           for(let i=0;i<arr.length;i++){
-            if((arr[i].count - arr[i].cancel_count)!=0){
+            if((arr[i].count - arr[i].cancel_count)  >0){
                arrTwo.push(arr[i])
             }
           }
@@ -2308,7 +2311,8 @@ export default {
      var count =0
      var arr = []
      for(let i=0;i<this.cancelInfoList.length;i++){
-       if(warehousing_id == this.cancelInfoList[i].warehousing_id && good_id == this.cancelInfoList[i].good_id){
+       
+       if(this.cancelInfoList[i].patient_id >0 && warehousing_id == this.cancelInfoList[i].warehousing_id && good_id == this.cancelInfoList[i].good_id){
           arr.push(this.cancelInfoList[i])
        }
      }

src/xt_pages/user/dialysisRecord.vue

@@ -353,9 +353,9 @@
               <tr v-for="item in recordData" :key="item.id">
                 <td>{{ item.dialysis_date | parseTime("{y}-{m}-{d}") }}</td>
                 <td>{{ scheduleType(item.schedule_type) }}</td>
-                <td>{{ item.partition_name }}-{{ item.device_number }}</td>
+                <td>{{ item.partition_name }}-{{ item.device.number }}</td>
                 <td>{{ modeName(item.prescription.mode_id) }}</td>
-                <td>{{ item.prescription.dialysis_duration }}</td>
+                <td>{{getTime(item.assessment_after_dislysis)}}</td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
                 <td>{{ item.predialysis_evaluation.weight_before }}</td>
                 <td>{{ item.assessment_after_dislysis.weight_after }}</td>
@@ -650,8 +650,9 @@ export default {
             this.recordData[i].AnticoagulantsConfit = this.setAnticoagulantsConfit(this.recordData[i].prescription)
             this.recordData[i].nurse_name = this.recordData[i].role.user_name
             this.recordData[i].doc_name = this.recordData[i].prescription.role.user_name
-            this.recordData[i].bed_number = this.recordData[i].partition_name + "-" + this.recordData[i].device_number
-            this.recordData[i].dialysis_duration = this.recordData[i].prescription.dialysis_duration
+       
+            this.recordData[i].bed_number = this.recordData[i].partition_name + "-" + this.recordData[i].device.number
+            this.recordData[i].dialysis_duration_hour = this.getTime(this.recordData[i].assessment_after_dislysis)
             this.recordData[i].dry_weight = this.recordData[i].predialysis_evaluation.dry_weight
             this.recordData[i].weight_before = this.recordData[i].predialysis_evaluation.weight_before
             this.recordData[i].weight_after = this.recordData[i].assessment_after_dislysis.weight_after
@@ -663,11 +664,12 @@ export default {
             if(this.recordData[i].dialyzer_perfusion_apparatus == ""){
               this.recordData[i].dialyzer_perfusion_apparatus = this.recordData[i].prescription.dialysis_dialyszers + "/" + this.recordData[i].prescription.dialysis_irrigation
             }
+            this.recordData[i].patient_name = this.currentPatient.name
           }
          }
          
-         const tHeader = ['透析日期','班次', '分区机号', '透析模式','透析时长','干体重','透前体重','透后体重','透前血压','透后血压','目标超滤量','抗凝剂 首剂/维持/总量','透析器型号','治疗护士','治疗医生']
-         const filterVal = ['dialysis_date_one','bed_class', 'bed_number', 'mode_name','dialysis_duration','dry_weight','weight_before','weight_after','befor_pressure','after_pressure','target_ultrafiltration','AnticoagulantsConfit','dialyzer_perfusion_apparatus','nurse_name','doc_name']
+         const tHeader = ['姓名','透析日期','班次', '分区机号', '透析模式','透析时长','干体重(kg)','透前体重(kg)','透后体重(kg)','透前血压(mmHg)','透后血压(mmHg)','目标超滤量','抗凝剂 首剂/维持/总量','透析器型号','治疗护士','治疗医生']
+         const filterVal = ['patient_name','dialysis_date_one','bed_class', 'bed_number', 'mode_name','dialysis_duration_hour','dry_weight','weight_before','weight_after','befor_pressure','after_pressure','target_ultrafiltration','AnticoagulantsConfit','dialyzer_perfusion_apparatus','nurse_name','doc_name']
         
          const data = this.formatJson(filterVal, this.recordData)
          excel.export_json_to_excel({