518合并代码

src/xt_pages/data/components/drugs.vue

@@ -1199,7 +1199,7 @@
             if (results[i]['默认给药途径'] === undefined) {
                 obj['delivery_way'] = ''
               } else {
-            if (key == '经销商') {
+            if (key == '默认给药途径') {
                 obj['delivery_way'] = results[i][key].replace(/\s/g,"")
               }
            }

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -440,7 +440,6 @@ export default {
     this.getAllZone();
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
-    // this.template_id = this.$store.getters.xt_user.template_info.template_id;
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
@@ -470,13 +469,11 @@ export default {
 
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
-      console.log("班次",this.listQuery.schedul_type)
       this.requestSchedualDoctors(this.time);
     },
     selectPartitionType(partitionType) {
       this.partitionType = partitionType;
       this.listQuery.partition_type = partitionType;
-      console.log("分区",this.listQuery.partition_type)
       this.requestSchedualDoctors(this.time);
     },
 
@@ -522,23 +519,22 @@ export default {
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
 
-        console.log("班次",schedule_type,"分区",partition_type)
         getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
             var schedules = resp.data.scheduals
-            console.log("列表数据",schedules)
+         
             var config = resp.data.config
-            console.log("config222222",config.is_open)
+           
             let project_config = resp.data.project_config
-            console.log('project_config',)
+            
             if(project_config.is_open == 1){
               this.project = resp.data.project
               console.log( this.project)
              
               let projectArr = []
-              if(this.org_id !=9671 && this.org_id!= 10318){
+              if(this.org_id!= 10318){
                 this.project.map(item => {
                   resp.data.hisAdvices.map(it => {
                     if(item.patient_id == it.patient_id){
@@ -546,14 +542,15 @@ export default {
                     }
                   })
                 })
-               
+                 console.log("projexta仍然333232323232",projectArr)
                  resp.data.hisAdvices.map((item,index) => {
                   if(projectArr[index].project && projectArr[index].project.length > 0){
-                    projectArr[index].project.map(it => {
+                     projectArr[index].project.map(it => {
+                      console.log("i23323232323我的",it)
                       let obj = {
                         advice_doctor: it.doctor,
                         start_time:it.start_time,
-                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name+' '+it.count + it.project.unit : it.good_info.good_name +' '+it.count+ it.good_info.packing_unit,
                         execution_time:it.execution_time,
                         execution_state:it.execution_state,
                         execution_staff:it.execution_staff,
@@ -575,10 +572,10 @@ export default {
                 })
               }
             
-              console.log(projectArr)
+              console.log("repso23323233232",resp.data.hisAdvices)
 
             }
-            console.log('resp.data.hisAdvices',resp.data.hisAdvices)
+           
            if(config.is_open == 0 || config.is_open == 2){
             this.show = true
             this.showOne = false
@@ -602,7 +599,7 @@ export default {
                     arr.push(it)
                 })
             })
-            console.log("班次3333333",this.schedulType)
+           
             if(this.schedulType == 0){
                 newSchedules = arr
             }else{
@@ -613,7 +610,7 @@ export default {
                 })
             }
 
-            console.log("分区",this.partitionType)
+           
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
             }else {
@@ -625,7 +622,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
-            console.log("列表22222",this.scheduleMap)
+
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -642,10 +639,11 @@ export default {
             this.indexInfoList = newArr
            }
            if(config.is_open == 1){
+            console.log("进阿里云 2323323223我的")
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
-            console.log("hhhhhhhh22323232323232",schedules)
+           
             let arr = []
             let newArr = []
             let newSchedules = []
@@ -688,7 +686,7 @@ export default {
                 })
                 this.scheduleMap = a
             }
-            console.log('333333344444',this.scheduleMap)
+ 
             this.scheduleMap.map(ele => {
                 let firstIndex = this.scheduleMap.findIndex(item => {
                   return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
@@ -705,8 +703,9 @@ export default {
             this.indexInfoList = newArr
            }
          }
-         console.log("列表22222",this.indexInfoList)
+         
         })
+        
     },
     getValue: function(val) {
       if (val != undefined) {

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2425,7 +2425,8 @@ export default {
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2453,12 +2454,15 @@ export default {
                       
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
-                          }
+                           if(newArr[i].is_user!=1){
+                             if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                             }
+                           }
+                       
                         }
                       }
                       console.log("newArr",newArr )
@@ -2483,7 +2487,8 @@ export default {
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2523,12 +2528,15 @@ export default {
                       
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                        
                         }
                       }
                       console.log("newArr",newArr )
@@ -2913,7 +2921,9 @@ export default {
       //     return
       //   }
       // }
-       if (row.sum_count <= 0) {
+    
+      if(row.is_user!=1){
+        if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.sum_count <= 0) {
@@ -2926,6 +2936,8 @@ export default {
           this.$message.error(row.drug_name + '库存不足')
           return
        }
+      }
+
       this.curDrugs = selection
     },
 

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -462,13 +462,19 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+         
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+        
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -506,13 +512,19 @@
       },
       changePrescribingNumber(scope) {
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+           if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+        
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+         
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2429,7 +2429,7 @@
                             sum_count:item.drug.sum_count,
                             out_count:0,
                             str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
-
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2469,12 +2469,15 @@
                       
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                         
                         }
                       }
                       console.log("newArr",newArr )
@@ -2499,7 +2502,8 @@
                             child: [],
                             sum_count:item.drug.sum_count,
                             out_count:0,
-                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit
+                            str:item.drug.drug_name + " "+item.drug.dose + item.drug.dose_unit + "*" + item.drug.min_number + item.drug.min_unit+"/"+item.drug.max_unit,
+                            is_user:item.drug.is_user,
                           };
                         }
                       });
@@ -2527,12 +2531,15 @@
                       console.log("new233223322323",newArr)
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
-                          if(newArr[i].out_count > newArr[i].sum_count){
-                            this.$message.error(newArr[i].str + "库存不足,保存失败!")
-                            isLoading = false
-                            this.$emit('editKeepLoad', false)
-                            return
+                          if(newArr[i].is_user!=1){
+                            if(newArr[i].out_count > newArr[i].sum_count){
+                              this.$message.error(newArr[i].str + "库存不足,保存失败!")
+                              isLoading = false
+                              this.$emit('editKeepLoad', false)
+                              return
+                            }
                           }
+                        
                         }
                       }
                       console.log("newArr",newArr )
@@ -2895,7 +2902,7 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        //console.log("row233232233232",row)
+        console.log("row233232233232",row)
         // if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10188 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10188 || this.org_id == 10191 || this.org_id == 10278 || this.org_id == 10217 || this.org_id ==10210 || this.org_id ==10318 || this.org_id ==10340){
         //     if (row.count <= 0) {
         //       if (selection) {
@@ -2925,8 +2932,9 @@
         //       return
         //     }
         // }
-
-        if (row.sum_count <= 0) {
+        
+        if(row.is_user!=1){
+          if (row.sum_count <= 0) {
           if (selection) {
             selection.forEach(row => {
               if (row.sum_count <= 0) {
@@ -2939,7 +2947,7 @@
           this.$message.error(row.drug_name + '库存不足')
           return
          }
-
+        }
         this.curDrugs = selection
       },
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -432,6 +432,7 @@
 
       },
       getAllChange(scope) {
+        console.log("scope23322332233232",scope)
         if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
           if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             console.log(1)
@@ -454,13 +455,19 @@
         }
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
           // scope.row.retail_price = scope.row.drug.min_number / scope.row.retail_price
-          if (scope.row.prescribing_number > scope.row.drug.sum_count) {
+          if(scope.row.drug.is_user!=1){
+           if (scope.row.prescribing_number > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+         
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+          if(scope.row.drug.is_user!=1){
+           if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
             this.$message.error(scope.row.drug_name + '库存不足')
+           }
           }
+         
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
 
@@ -548,13 +555,19 @@
 
 
         if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
-          if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if (parseInt(scope.row.prescribing_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+       
         } else {
-          if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
-            this.$message.error(scope.row.drug_name + '库存不足')
+          if(scope.row.drug.is_user!=1){
+            if ((parseInt(scope.row.prescribing_number) * scope.row.drug.min_number) > scope.row.drug.sum_count) {
+              this.$message.error(scope.row.drug_name + '库存不足')
+            }
           }
+        
         }
       },
       getProjectSingleDose(scope) {

src/xt_pages/outpatientTool/components/detailStatistics.vue

@@ -168,9 +168,9 @@
       <div>总费用:{{ getAllPice() }}</div>
       <div>
         个人支付: 
-       
-        <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
-        <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+        {{getActPay()}}
+        <!-- <span v-if="his_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>  
+        <span v-if="his_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
       
       </div>
       <div>基金支付记账:{{ getFundPaySumamt() }}</div>
@@ -444,12 +444,25 @@ export default {
       return total_price.toFixed(2);
     },
     getActPay() {
+      var arrNew = []
       var act_pay = 0;
       for (let i = 0; i < this.list.length; i++) {
         for (let j = 0; j < this.list[i].orders.length; j++) {
-          act_pay += this.list[i].orders[j].psn_cash_pay;
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
         }
       }
+      console.log("arrNew2332323223",arrNew)
       return act_pay.toFixed(2);
     },
     getFundPaySumamt() {

src/xt_pages/outpatientTool/detailPrint.vue

@@ -19,29 +19,27 @@
             <td>患者姓名：{{ patient.name }}</td>
             <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
             <td>结算类别：
-          <!-- {{ getType(his_patient.balance_accounts_type) }} -->
-          {{getType(his_record_patient.balance_accounts_type)}}</td>
+            <span v-if="his_patient!=null&&his_patient.balance_accounts_type >0"> {{ getType(his_patient.balance_accounts_type) }} </span>
+            <span v-if="his_record_patient!=null&&his_record_patient.balance_accounts_type >0">{{getType(his_record_patient.balance_accounts_type)}}</span></td>
             <td>发票号码：{{order.fa_piao_number}}</td>
           </tr>
           <tr>
             <td>住院/门诊号：
-          <!-- {{his_patient.number}} -->
-          {{his_record_patient.ipt_otp_no}}</td>
+          <span v-if="his_patient!=null && his_patient.number!=''">{{his_patient.number}}</span>
+          <span v-if="his_record_patient!=null && his_record_patient.ipt_otp_no!=''">{{his_record_patient.ipt_otp_no}}</span></td>
             <td>科室：
-          <!-- {{ getDepartment(his_patient.departments) }} -->
-          {{ getDepartment(his_record_patient.departments) }}</td>
+          <span v-if="his_patient!=null && his_patient.departments >0"> {{ getDepartment(his_patient.departments) }}</span> 
+          <span v-if="his_record_patient!=null && his_record_patient.departments > 0">{{ getDepartment(his_record_patient.departments) }}</span></td>
             <td>就诊流水号：
-          <!-- {{ his_patient.number }} -->
-          {{his_record_patient.number}}</td>
+          <span v-if="his_patient!=null && his_patient.number!=''"> {{ his_patient.number }}</span>
+          <span v-if="his_record_patient!=null && his_record_patient.number!=''">{{his_record_patient.number}}</span></td>
           </tr>
           <tr>
             <td>总费用：{{ getAllPice() }}</td>
             <td>个人支付：
-          <!-- <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span> -->
-          
-          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
-          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
+             {{getActPay()}}
+            <!-- <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+            <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span> -->
             </td>
             <td>基金支付记账：{{ getFundPaySumamt() }}</td>
             <td>补充医疗支付记账：{{ getHifesPay() }}</td>
@@ -394,12 +392,27 @@ export default {
       }
       return total_price;
     },
-    getActPay(){
-      var act_pay = 0
-      for(let i=0;i<this.orderList.length;i++){
-         act_pay += this.orderList[i].psn_part_amt
+    getActPay() {
+      var arrNew = []
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
+        }
       }
-      return act_pay.toFixed(2)
+      console.log("arrNew2332323223",arrNew)
+      return act_pay.toFixed(2);
     },
     getFundPaySumamt() {
       var fund_pay_sumamt = 0;

src/xt_pages/outpatientTool/gatherPrint.vue

@@ -53,7 +53,7 @@
         <div class="listInfo" style="margin-bottom: 20px;">
             <div>记账支付：{{getFundPaySumamt()}}</div>
             <div>个人账号：{{getAcctPay()}}</div>
-            <div>现金支付：{{getPsnCashPay()}}</div>
+            <div>现金支付：{{getActPay()}}</div>
         </div>
         <table class="listTable" border="1">
             <tr>
@@ -145,6 +145,7 @@
           his_record_patient:{},
           orderList:[],
           org_id:0,
+          list:[],
         }
     },
     methods:{
@@ -195,8 +196,9 @@
           this.drugTypeList =response.data.data.drugTypeList
           this.costClassifyList = response.data.data.costClassifyList 
           var list = response.data.data.list
+          this.list = list
           this.orderList = response.data.data.orderList
-
+          console.log("orderlist23323223",this.orderList)
           var new_arr = []
 
           for(let i=0;i<list.length;i++){
@@ -659,7 +661,7 @@
       if(total_price > 0){
         return total_price.toFixed(2)
       }else{
-        return total_price
+        return "0.00"
       }
      
     },
@@ -1080,38 +1082,62 @@
       }
     },
     getPsnCashPay(){
-      var psn_cash_pay = 0
+      var psn_cash_pay = 0.00
       for(let i=0;i<this.orderList.length;i++){
         psn_cash_pay += this.orderList[i].psn_cash_pay
       }
       if(psn_cash_pay > 0){
          return psn_cash_pay.toFixed(2)
       }else{
-        return 0.00
+        return "0.00"
       }
     },
     getAcctPay(){
-      var acct_pay = 0
+      var acct_pay = 0.00
       for(let i=0;i<this.orderList.length;i++){
          acct_pay +=this.orderList[i].acct_pay
       }
       if(acct_pay > 0){
         return acct_pay.toFixed(2)
       }else{
-        return 0.00
+        return "0.00"
       }
     },
     getFundPaySumamt(){
-      var fund_pay_sumamt = 0
+      var fund_pay_sumamt = 0.00
       for(let i=0;i<this.orderList.length;i++){
         fund_pay_sumamt +=this.orderList[i].fund_pay_sumamt
       }
+     
       if(fund_pay_sumamt >0){
         return fund_pay_sumamt.toFixed(2)
       }else{
-        return 0.00
+      
+        return "0.00"
       }
-    }
+    },
+    getActPay() {
+      var arrNew = []
+      var act_pay = 0;
+      for (let i = 0; i < this.list.length; i++) {
+        for (let j = 0; j < this.list[i].orders.length; j++) {
+          //个人支付
+          console.log("is",this.list[i].orders[j])
+          if(this.list[i].orders[j].is_medicine_insurance == 0){
+             arrNew.push(this.list[i].orders[j])
+          }
+        }
+      }
+      if(arrNew.length > 0){
+        for(let i=0;i<arrNew.length;i++){
+           for(let j=0;j<arrNew[i].order_info.length;j++){
+             act_pay += arrNew[i].order_info[j].cnt * arrNew[i].order_info[j].pric
+           }
+        }
+      }
+      console.log("arrNew2332323223",arrNew)
+      return act_pay.toFixed(2);
+    },
 
     },
     created(){

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -768,11 +768,14 @@ export default {
       },
 
     exportList(){
+      console.log("shij232333",this.tableOut)
+     
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
+        this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
         if(this.orgId == 9919){
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
@@ -809,9 +812,9 @@ export default {
         }
        }
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','出库时间','备注']
 
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','ctime','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
 

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

@@ -570,9 +570,10 @@ export default {
     },
 
      exportList(){
-
+      
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
+          this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919){
@@ -591,8 +592,8 @@ export default {
 
 
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
+       const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','出库时间','备注']
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','ctime','remark']
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
          obj.total_price += this.tablePrint[i].total
@@ -701,6 +702,7 @@ export default {
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
+         
             let objInfo = {}
             if(this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -721,6 +723,7 @@ export default {
                   min_number:item.XtBaseDrug.min_number,
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
+                  ctime:item.ctime,
                 }
               }
              })
@@ -743,6 +746,7 @@ export default {
                   min_number:item.XtBaseDrug.min_number,
                   max_unit:item.XtBaseDrug.max_unit,
                   min_price:item.XtBaseDrug.min_price,
+                  ctime:item.ctime,
                 }
               }
             })

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -104,6 +104,11 @@
             {{ scope.row.price }}
           </template>
         </el-table-column>
+         <el-table-column prop="remake" label="备注" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.remark }}
+          </template>
+        </el-table-column>
       </el-table>
 
       <el-pagination

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -273,6 +273,7 @@ export default {
             min_price:0,
             drug_id:0,
             storehouse_id:0,
+            houseList:[],
         }
     },
     methods:{

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -1404,7 +1404,7 @@ export default {
       getExportOutOrderDrugList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
-          // console.log("list22222", list);
+        
           this.exportList = list;
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
@@ -1412,11 +1412,12 @@ export default {
       });
     },
     toExport() {
+     
       if (this.order_id == "") {
         this.$message.error("请勾选出库单");
         return;
       }
-      // console.log("hh2323232322323", this.exportList);
+     
       for (let i = 0; i < this.exportList.length; i++) {
         if (this.exportList[i].dealer == 0) {
           this.exportList[i].dealer = "";
@@ -1454,6 +1455,7 @@ export default {
             this.exportList[i].dealer = this.dealerList[z].dealer_name;
           }
         }
+        this.exportList[i].ctime = this.getTime(this.exportList[i].ctime)
       }
 
       import("@/vendor/Export2Excel").then((excel) => {
@@ -1478,6 +1480,7 @@ export default {
           "有效日期",
           "经销商",
           "批准文号",
+          "出库时间",
           "备注",
         ];
         const filterVal = [
@@ -1494,6 +1497,7 @@ export default {
           "expiry_date",
           "dealer",
           "number",
+          "ctime",
           "remark",
         ];
 

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -27,7 +27,7 @@
                 >
             </div>
             <div>
-               <!-- <el-button size="small" type="primary" @click="print_1">打印</el-button> -->
+               <el-button size="small" type="primary" @click="print_1">打印</el-button>
                <el-button size="small" type="primary" @click="print">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/drugs/print.vue

@@ -41,7 +41,8 @@
                         <td> 
                             <span v-if="item.stock_max_number>0">{{item.stock_max_number}}{{item.warehousing_unit}} </span>  
                             <span v-if="item.stock_min_number>0">{{item.stock_min_number}}{{item.min_unit}}</span>
-                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span></td>
+                            <span v-if="item.stock_max_number == 0 && item.stock_min_number == 0">0</span>
+                        </td>
                         <td>
                             <span v-if="item.last_stock_max_number > 0">{{item.last_stock_max_number}}{{item.warehousing_unit}}</span>  
                             <span v-if="item.last_stock_min_number>0">{{item.last_stock_min_number}}{{item.min_unit}}</span>
@@ -52,9 +53,15 @@
                           <span v-if="item.inventory_type == 11">盘亏</span>  
                         </td>
                         <td>{{getPrice(item.id)}}</td>
-                        <td v-if="item.inventory_type == 11">{{getTotalPrice(item.stock_max_number,item.stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit) - getReduceTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit)}}</td>
-                        <td v-if="item.inventory_type == 10">{{getTotalPrice(item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit) - getReduceTotalPrice(item.stock_max_number,item.stock_min_number,item.min_number,item.id,item.warehousing_unit,item.min_unit)}}</td>
-                        <td v-if="item.inventory_type != 10 && item.inventory_type!=11">0</td>
+                      
+                        <td v-if="item.inventory_type ==11">
+                          <span>{{getCount(item.stock_max_number,item.stock_min_number,item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id)}}</span>
+                        </td>
+
+                        <td v-if="item.inventory_type ==10">
+                          <span>{{getCountOne(item.stock_max_number,item.stock_min_number,item.last_stock_max_number,item.last_stock_min_number,item.min_number,item.id)}}</span>
+                        </td>
+                        <td v-if="item.inventory_type!=10 && item.inventory_type!=11"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -69,6 +76,7 @@ const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/drug/drug"
 import print from "print-js";
+import { min } from 'moment';
 export default {
     components:{
         BreadCrumb
@@ -122,7 +130,7 @@ export default {
               this.tableData = response.data.data.list
               this.houseList = response.data.data.houseList
               this.inventoryList = response.data.data.inventoryList
-              console.log("hhahhh2o2o233oo2332",this.inventoryList)
+              console.log("hhahhh2o2o233oo2332",this.tableData)
               
              }
           })   
@@ -146,79 +154,15 @@ export default {
           }
           return number
          },
-         getTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,last_max_unit,last_min_unit){
-           var retail_price = 0
-           var totail_price =0
-           var max_unit = ""
-           var min_unit = ""
-           var max_number = 0
-           for(let i=0;i<this.inventoryList.length;i++){
-            if(id == this.inventoryList[i].id){
-              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
-              max_unit = this.inventoryList[i].drug.max_unit
-              min_unit = this.inventoryList[i].drug.min_unit
-            }
-          }
-          console.log("max_unit",max_unit)
-          console.log("min_unit",min_unit)
-          if(last_max_unit == max_unit){
-            if(last_stock_max_number%min_number == 0){
-              totail_price = (last_stock_max_number/min_number) * retail_price + last_stock_min_number * retail_price
-            }
-            if(last_stock_max_number%min_number != 0){
-                totail_price = (last_stock_max_number/min_number)* retail_price + (last_stock_min_number%min_number) * retail_price + last_stock_min_number * retail_price
-            }
-          }
-          if(last_min_unit == min_unit){
-            totail_price = last_stock_max_number * retail_price + last_stock_min_number * retail_price
-          }
-          if(totail_price > 0){
-             return totail_price.toFixed(4)
-          }else{
-            return ""
-          }
-         },
-         getReduceTotalPrice(last_stock_max_number,last_stock_min_number,min_number,id,last_max_unit,last_min_unit){
-           var retail_price = 0
-           var totail_price =0
-           var max_unit = ""
-           var min_unit = ""
-           var max_number = 0
-           for(let i=0;i<this.inventoryList.length;i++){
-            if(id == this.inventoryList[i].id){
-              retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
-              max_unit = this.inventoryList[i].drug.max_unit
-              min_unit = this.inventoryList[i].drug.min_unit
-            }
-          }
-          console.log("max_unit",max_unit)
-          console.log("min_unit",min_unit)
-          if(last_max_unit == max_unit){
-            if(last_stock_max_number%min_number == 0){
-              totail_price = (last_stock_max_number/min_number) * retail_price + last_stock_min_number * retail_price
-            }
-            if(last_stock_max_number%min_number != 0){
-                totail_price = (last_stock_max_number/min_number)* retail_price + (last_stock_min_number%min_number) * retail_price + last_stock_min_number * retail_price
-            }
-          }
-          if(last_min_unit == min_unit){
-            totail_price = last_stock_max_number * retail_price + last_stock_min_number * retail_price
-          }
-          if(totail_price > 0){
-             return totail_price.toFixed(4)
-          }else{
-            return ""
-          }
-         },
          getPrice(id){
-           var retail_price = 0
+           var price = 0
            for(let i=0;i<this.inventoryList.length;i++){
             if(id == this.inventoryList[i].id){
-               retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+               price = this.inventoryList[i].drug_warehouse_info.price
             }
           }
-          if(retail_price > 0){
-          return retail_price
+          if(price > 0){
+          return price
           }
           
          },
@@ -234,6 +178,76 @@ export default {
          }else{
            return storehouse_name
          }
+       },
+       getCount(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+        for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
+          }
+        }
+
+         //如果透前数量大于透后数量 盘亏
+         if(befor_total_count  > after_total_count){
+           cha_count = befor_total_count - after_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         console.log("price",price/min_number)
+         console.log("max_count23323232",max_count)
+         console.log("min_count33333",min_count)
+         console.log("min_number2332233232",min_number)
+         
+         total_price = Math.floor(max_count) * price + min_count * (price/min_number)
+         
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
+         }
+        return cha_count
+       },
+       getCountOne(stock_max_number,stock_min_number,last_stock_max_number,last_stock_min_number,min_number,id){
+         var cha_count = 0
+         var befor_total_count = 0
+         var after_total_count = 0
+         var befor_total_count = stock_max_number * min_number + stock_min_number
+         var after_total_count = last_stock_max_number * min_number + last_stock_min_number
+         var retail_price = 0
+         var price = 0
+         var max_count = 0
+         var min_count = 0
+         var total_price = 0
+          for(let i=0;i<this.inventoryList.length;i++){
+          if(id == this.inventoryList[i].id){
+            retail_price = this.inventoryList[i].drug_warehouse_info.retail_price
+            price = this.inventoryList[i].drug_warehouse_info.price
+          }
+        }
+         //如果透前数量大于透后数量 盘盈
+         if(befor_total_count  < after_total_count){
+           cha_count = after_total_count - befor_total_count
+         }
+         max_count = cha_count/min_number
+         min_count = cha_count%min_number
+         total_price =  Math.floor(max_count) *price + min_count * (price/min_number)
+         if(total_price > 0){
+            return total_price.toFixed(2)
+         }else{
+          return ""
+         }
+        
        }
     },
     created(){

src/xt_pages/stock/inventoryDetails.vue

@@ -26,7 +26,7 @@
                 @click="search">搜索</el-button>
             </div>
             <div>
-              <!-- <el-button type="primary" @click="toprint">打印</el-button> -->
+              <el-button type="primary" @click="toprint">打印</el-button>
               <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
             </div>
             <!-- <div>

src/xt_pages/stock/print_all.vue

@@ -42,19 +42,13 @@
                         <td>{{item.last_stock_count}}</td>
                         <td>
                           <span v-if="item.stock_count > item.last_stock_count">盘亏</span>
-                           <span v-if="item.stock_count < item.last_stock_count">盘盈</span></td>
-                        <td></td>
-                         <td></td>
-                        <!-- <td>  
-                          <span v-if="parseInt(item.stock_count) > parseInt(item.last_stock_count)">盘亏</span>
-                          <span v-if="parseInt(item.stock_count) < parseInt(item.last_stock_count)">盘盈</span>
-                        </td>
-                        <td>{{item.buy_price}}</td>
-                        <td>
-                          <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
-                          <span v-if="item.stock_count < item.last_stock_count">{{((item.last_stock_count - item.stock_count)  * item.buy_price).toFixed(2)}}</span> 
-                          <span v-if="item.stock_count = item.last_stock_count">0</span> 
-                        </td> -->
+                          <span v-if="item.stock_count < item.last_stock_count">盘盈</span></td>
+                        <td><span>{{item.buy_price}}</span></td>
+                         <td>
+                            <span v-if="item.stock_count > item.last_stock_count">{{((item.stock_count - item.last_stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                            <span v-if="item.stock_count < item.last_stock_count">{{((item.last_stock_count - item.stock_count)  * item.buy_price).toFixed(2)}}</span> 
+                            <span v-if="item.stock_count == item.last_stock_count">0</span> 
+                         </td>
                     </tr>
                     </tbody>
                 </table>

src/xt_pages/stock/stockBatchNumber.vue

@@ -92,6 +92,11 @@
              <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="备注" align="center">
+           <template slot-scope="scope">
+             <span>{{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/stock/stockOutOrder.vue

@@ -1284,6 +1284,7 @@ export default {
       }
     },
     select(selection) {
+     
       var ids = [];
       for (let i = 0; i < selection.length; i++) {
         ids.push(selection[i].id);
@@ -1291,7 +1292,9 @@ export default {
 
       this.exportList = [];
       this.order_id = ids.join(",");
-      this.warehouse_out_time = selection[0].warehouse_out_time;
+      if(selection.length >0){
+        this.warehouse_out_time = selection[0].warehouse_out_time;
+      }
       this.selectedTableData = selection;
       this.getlist();
     },
@@ -1874,7 +1877,7 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
       };
-
+      console.log("params2332323232de",params)
       getOutExportList(params).then((response) => {
         if (response.data.state == 1) {
           var list = response.data.data.list;
@@ -1920,6 +1923,8 @@ export default {
         this.$message.error("请勾选出库单");
         return;
       }
+      console.log("时间",this.exportList)
+      
       import("@/vendor/Export2Excel").then((excel) => {
         for (let i = 0; i < this.exportList.length; i++) {
           this.exportList[i].total_price =
@@ -1938,6 +1943,7 @@ export default {
           if (this.exportList[i].good_type_id == 0) {
             this.exportList[i].good_type_id = "";
           }
+          this.exportList[i].ctime = this.getTime(this.exportList[i].ctime, "{y}-{m}-{d}")
         }
 
         const tHeader = [
@@ -1952,6 +1958,7 @@ export default {
           "生产日期",
           "有效期",
           "备注",
+          "出库时间"
         ];
         const filterVal = [
           "good_name",
@@ -1965,6 +1972,7 @@ export default {
           "product_date",
           "expiry_date",
           "remark",
+          "ctime",
         ];
 
         const data = this.formatJson(filterVal, this.exportList);