新分支

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

           }
         }
 
-        if(this.$store.getters.xt_user.org_id == 10469 || this.$store.getters.xt_user.org_id == 0){
+        if(this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 0){
+          //  console.log("----------------------",this.selected_date)
+            console.log("星期",this.getweekday(this.selected_date))
             var newArrList = []
-            var total_day = ""
-            if(moment().weekday() == 1){
-              total_day ="周一"
-            }
-            if(moment().weekday() == 2){
-              total_day ="周二"
-            }
-            if(moment().weekday() == 3){
-              total_day ="周三"
-            }
-            if(moment().weekday() == 4){
-              total_day ="周四"
-            }
-            if(moment().weekday() == 5){
-              total_day ="周五"
-            }
-            if(moment().weekday() == 6){
-              total_day ="周六"
-            }
-            if(moment().weekday() == 7){
-              total_day ="周日"
-            }
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
           if(newArr!=null && newArr.length >0){
             for(let i=0;i<newArr.length;i++){
-              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(total_day)!=-1)){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.selected_date))!=-1)){
                 console.log("药品名称",newArr[i].advice_name)
                  newArrList.push(newArr[i])
               }
             }
           }
         }
-        if(this.$store.getters.xt_user.org_id != 10469 && this.$store.getters.xt_user.org_id != 0){
+        if(this.$store.getters.xt_user.org_id != 9671 && this.$store.getters.xt_user.org_id != 0){
          
           if(newArr!=null && newArr.length > 0){
             for(let i=0;i<newArr.length;i++){
      changePartionType(){
       this.tableList = []
       this.statistics()
-     }
+     },
+     getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
     }
   }
 </script>

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

 
         if(this.$store.getters.xt_user.org_id == 10469 || this.$store.getters.xt_user.org_id == 0){
             var newArrList = []
-            var total_day = ""
-            if(moment().weekday() == 1){
-              total_day ="周一"
-            }
-            if(moment().weekday() == 2){
-              total_day ="周二"
-            }
-            if(moment().weekday() == 3){
-              total_day ="周三"
-            }
-            if(moment().weekday() == 4){
-              total_day ="周四"
-            }
-            if(moment().weekday() == 5){
-              total_day ="周五"
-            }
-            if(moment().weekday() == 6){
-              total_day ="周六"
-            }
-            if(moment().weekday() == 7){
-              total_day ="周日"
-            }
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
           if(newArr!=null && newArr.length >0){
             for(let i=0;i<newArr.length;i++){
-              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(total_day)!=-1)){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.$route.query.schedule_date))!=-1)){
                 
                  newArrList.push(newArr[i])
               }
         const res = new Map()
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
       },
+
+      getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
+
+      
     }
   }
 </script>

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

         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-
+        
       >
       <!-- @selection-change="handleSelectionChange" -->
         <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+               
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223 && org_id!=10445"
+          v-if="template_id != 6 && org_id!=10223 && org_id!=10445 && org_id!=0"
           prop="checker"
           min-width="30px"
           align="center"
         </el-table-column>
       </el-table>
 
-
+     
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+                 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
         src_type:"",
         org_id:0,
         schedulePatient:{},
+        tempArrOne:[],
       }
     },
     watch: {
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
 
+      'doctor_advices': function() {
+      
+        this.handleSpanTempArrOne();
+      },
+     
     },
     methods: {
+      handleSpanTempArrOne() {
+          this.tempArrOne = [];
+          console.log("hhahhahahahahah",this.doctor_advices)
+          for (let i = 0; i < this.doctor_advices.length; i++) {
+            if (i === 0) {
+              this.tempArrOne.push(1);
+              this.pos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (
+                this.doctor_advices[i].groupno ===
+                this.doctor_advices[i - 1].groupno
+              ) {
+                this.tempArrOne[this.pos] += 1;
+                this.tempArrOne.push(0);
+              } else {
+                this.tempArrOne.push(1);
+                this.pos = i;
+              }
+            }
+          }
+      },
       handleSelectionChange(){
 
       },
-
+     
+    
       //调试
       lili(index,row){
         // console.log("==index==",index)
           return ''
         }
       },
+     
       submitEditAdvice() {
         // console.log()
         console.log("保存22222222222222")
         return true
       }
       ,
-      mergeSpan({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex != 2) {
-          const _row = this.tempArr[rowIndex]
-          const _col = _row > 0 ? 1 : 0
-          return {
-            rowspan: _row,
-            colspan: _col
-          }
-        }
-      }
-      ,
+    
+      
       handleSpanTempArr() {
         this.tempArr = []
 
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        console.log("hhhhhhhhhh",this.tempArrOne)
+        //合并单元格
+        if (columnIndex === 0 || columnIndex === 1 ) {
+          const _row = this.tempArrOne[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          console.log("_row====",_row)
+          console.log("_row----------",_col)
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
+        // if (columnIndex === 0) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
 
-        if (columnIndex === 0) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
-
-        if (columnIndex === 1) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
+        // if (columnIndex === 1) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
       }
     },
     created() {
-    
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date

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

     changeBloodAccessOpion(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }
     changeBloodAccessOpionOne(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }

src/xt_pages/management/components/WaterFormList.vue

               </template>
          </el-table-column>
 
-         <el-table-column label="静谧过滤器(MPa)" align="center" min-width="110px">
+         <el-table-column label="精密过滤器(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
                 {{ scope.row.ultrafilter?scope.row.ultrafilter:"" }}
               </template>
                  :rowspan="2"
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                  静谧过滤器（MPa）
+                  精密过滤器（MPa）
                 </td>
 
                 <td
             }
             import('@/vendor/Export2Excel').then(excel => {
 
-              const multiHeader = [['序号', '日期', '原水参数' , '', '','', '一级反渗', '', '二级反渗' , '', '碳罐(MPa)','砂罐(MPa)', '树脂罐(MPa)','静谧过滤器(MPa)','水质监测','','','','消毒','','过滤器更换','记录人' ]]
+              const multiHeader = [['序号', '日期', '原水参数' , '', '','', '一级反渗', '', '二级反渗' , '', '碳罐(MPa)','砂罐(MPa)', '树脂罐(MPa)','精密过滤器(MPa)','水质监测','','','','消毒','','过滤器更换','记录人' ]]
               const header = ['', '', '原水电导度', '原水压力', '温度','加压泵', '产水电导度', '产水量', '产水电导度', '产水量', '','','','','硬度(mg/l)','总氯(mg/l)','PH值','过氧乙酸(mg/l)','反渗膜消毒','输水管道消毒','','',]
               const merges = ['A1:A2', 'B1:B2', 'C1:F1','G1:H1','I1:J1','K1:K2','L1:L2','M1:M2','N1:N2','O1:R1','S1:T1','U1:U2','V1:V2']
               const filterVal = ['index','record_date','water_conductivity','water_pressure','temperature','force_pump_status','first_ro_membrane_effluent','first_water_yield','last_production_of_water_conductivity','last_water_yield','carbon_tank','snd_tank','resin_tank','ultrafilter','hardness_monitoring','ph_detection','total_chlorine_detection','concentration_of_peroxyacetic_acid','reverse_osmosis_membrane_disinfection_name','disinfection_of_water_pipeline_name','filter_replacement','user_name']

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

 <template>
-    <div>
-        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print">
-            <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
-                <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
-                <div class="infoMain">
-                    <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
-                    <div class="infoP">名称：{{info.org_name}}</div>
-                    <div class="infoP">医生工号：{{info.doctor_code}}</div>
-                    <div class="infoP">门诊流水号：{{info.number}}</div>
-                    <div class="infoP">科别: {{info.department}}</div>
-                    <div class="infoP">处方单据号：{{info.order_number}}</div>
-                    <div class="infoP">姓名：{{info.patient.name}}</div>
-                    <div class="infoP">医疗账号：{{info.health_card_no}}</div>
-                    <div class="infoP">医疗类别：</div>
-                </div>
-                <div class="chargeBox">
-                    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
-                        <div class="chargeUl" style="width:20%;">
-                            <p style="width:50%;border-right:1px solid #000;">费用类型</p>
-                            <p style="width:50%;border-right:1px solid #000;">金额</p>
-                        </div>
-                        <div class="chargeUl" style="width:80%;">
-                            <p style="width:40%;border-right:1px solid #000;">明细名称</p>
-                            <p style="width:15%;border-right:1px solid #000;">规格</p>
-                            <p style="width:15%;border-right:1px solid #000;">数量</p>
-                            <p style="width:15%;border-right:1px solid #000;">单价</p>
-                            <p style="width:15%;">金额</p>
-                        </div>
-                    </div>
-                    <div style="display:flex;justify-content: space-between;">
-                        <div style="width:20%;">
-                            <div class="chargeUl" v-if="info.bed_cost_total > 0">
-                                <p style="width:50%;">床位费</p>
-                                <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.operation_cost_total > 0">
-                                <p style="width:50%;">手术费</p>
-                                <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.other_cost_total > 0">
-                                <p style="width:50%;">其他费</p>
-                                <p style="width:50%;">{{info.other_cost_total?info.other_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.material_cost_total > 0">
-                                <p style="width:50%;">材料费</p>
-                                <p style="width:50%;">{{info.material_cost_total?info.material_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.western_medicine_cost_total > 0">
-                                <p style="width:50%;">西药费</p>
-                                <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.chinese_traditional_medicine_cost_total > 0">
-                                <p style="width:50%;">中成费</p>
-                                <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.check_cost_total > 0">
-                                <p style="width:50%;">检查费</p>
-                                <p style="width:50%;">{{info.check_cost_total?info.check_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.laboratory_cost_total > 0">
-                                <p style="width:50%;">化验费</p>
-                                <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.treat_cost_total > 0">
-                                <p style="width:50%;">治疗费</p>
-                                <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">费用合计</p>
-                                <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">记账支付</p>
-                                <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">个人账号</p>
-                                <p style="width:50%;">{{info.acct_pay?info.acct_pay:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
-                                <p style="width:50%;">现金支付</p>
-                                <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
-                            </div>
-                        </div>
-                        <div style="width:80%;max-height:500px;">
-                            <div style="display:flex;" v-for="(item,i) in info.order_infos.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
-                                <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span v-if='item.type == 1'>{{item.advice.advice_name}}</span>
-                                        <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
-                                        <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span v-if='item.type == 1'>{{item.advice.drug.drug_spec}}</span>
-                                        <span v-if='item.type == 2'>{{item.project.project.unit}}</span>
-                                        <span v-if='item.type == 3'>{{item.project.unit}}</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span>{{item.cnt}}次</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span>{{item.pric}}元</span>
-                                    </p>
-                                </div>
-                                <div style="width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="moneyBox">
-                    <p>实收金：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
-                    <p>记账前金额：{{0.00}}元</p>
-                    <p>扣款金额：{{0.00}}元</p>
-                    <p>记账后金额：{{info.balc}}元</p>
-                    <p>找赎金：{{0.00}}元</p>
-                </div>
-                <div class="actionBar">
-                    <div>收费员：{{info.charge_admin.user_name}}</div>
-                    <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
-                </div>
-            </div>
-
-        </div>
-        <div v-else id='prescription-print' class="prescription-print">
+  <div>
+      <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print">
           <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
               <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
               <div class="infoMain">
-                  <div class="infoP">医院(药店)编号：{{balanceAccounts.org_config.code}}</div>
-                  <div class="infoP">名称：{{balanceAccounts.org_config.org_name}}</div>
-                  <div class="infoP">医生工号：</div>
-                  <div class="infoP">门诊流水号：{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</div>
-                  <div class="infoP">科别: {{balanceAccounts.order.department_name ? balanceAccounts.order.department_name : ''}}</div>
-                  <div class="infoP">处方单据号：{{balanceAccounts.order.number ? balanceAccounts.order.number : ''}}</div>
-                  <div class="infoP">姓名：{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</div>
-                  <div class="infoP">医疗账号：</div>
-                  <div class="infoP">医疗类别：自费</div>
+                  <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
+                  <div class="infoP">名称：{{info.org_name}}</div>
+                  <div class="infoP">医生工号：{{info.doctor_code}}</div>
+                  <div class="infoP">门诊流水号：{{info.number}}</div>
+                  <div class="infoP">科别: {{info.department}}</div>
+                  <div class="infoP">处方单据号：{{info.order_number}}</div>
+                  <div class="infoP">姓名：{{info.patient.name}}</div>
+                  <div class="infoP">医疗账号：{{info.health_card_no}}</div>
+                  <div class="infoP">医疗类别：</div>
               </div>
               <div class="chargeBox">
                   <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
                   </div>
                   <div style="display:flex;justify-content: space-between;">
                       <div style="width:20%;">
-                          <div class="chargeUl" v-for="(item,i) in balanceAccounts.new_detail_list" :key="i">
-                              <p style="width:50%;">
-                                <span v-if="item.type == 1">药品费</span>
-                                <span v-if="item.type == 2">治疗费</span>
-                                <span v-if="item.type == 3">耗材费</span>
-                              </p>
-                              <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                          <div class="chargeUl" v-if="info.bed_cost_total > 0">
+                              <p style="width:50%;">床位费</p>
+                              <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.operation_cost_total > 0">
+                              <p style="width:50%;">手术费</p>
+                              <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.other_cost_total > 0">
+                              <p style="width:50%;">其他费</p>
+                              <p style="width:50%;">{{info.other_cost_total?info.other_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.material_cost_total > 0">
+                              <p style="width:50%;">材料费</p>
+                              <p style="width:50%;">{{info.material_cost_total?info.material_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.western_medicine_cost_total > 0">
+                              <p style="width:50%;">西药费</p>
+                              <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.chinese_traditional_medicine_cost_total > 0">
+                              <p style="width:50%;">中成费</p>
+                              <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.check_cost_total > 0">
+                              <p style="width:50%;">检查费</p>
+                              <p style="width:50%;">{{info.check_cost_total?info.check_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.laboratory_cost_total > 0">
+                              <p style="width:50%;">化验费</p>
+                              <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.treat_cost_total > 0">
+                              <p style="width:50%;">治疗费</p>
+                              <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">费用合计</p>
-                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                              <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">记账支付</p>
-                              <p style="width:50%;">0元</p>
+                              <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">个人账号</p>
-                              <p style="width:50%;">0元</p>
+                              <p style="width:50%;">{{info.acct_pay?info.acct_pay:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                               <p style="width:50%;">现金支付</p>
-                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                              <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
                           </div>
                       </div>
                       <div style="width:80%;max-height:500px;">
-                          <div style="display:flex;" v-for="(item,i) in balanceAccounts.order_info.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
+                          <div style="display:flex;" v-for="(item,i) in info.order_infos.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
                               <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                                   <p class="chargeP">
-                                      <span v-if='item.advice_id > 0'>{{item.advice.advice_name}}</span>
+                                      <span v-if='item.type == 1'>{{item.advice.advice_name}}</span>
                                       <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
                                       <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span v-if='item.advice_id > 0'>{{item.advice.drug.drug_spec}}</span>
+                                      <span v-if='item.type == 1'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
                                       <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
                                       <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span>{{item.cnt}}次</span>
+                                    <span v-if='item.type == 1'>{{item.cnt}}{{item.advice.prescribing_number_unit}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.cnt}}{{item.project.project.unit}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.cnt}}{{item.project.unit}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
 
               </div>
               <div class="moneyBox">
-                  <p>实收金：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                  <p>实收金：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
                   <p>记账前金额：{{0.00}}元</p>
                   <p>扣款金额：{{0.00}}元</p>
-                  <p>记账后金额：{{0.00}}元</p>
+                  <p>记账后金额：{{info.balc}}元</p>
                   <p>找赎金：{{0.00}}元</p>
               </div>
               <div class="actionBar">
-                  <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
-                  <div>日期：{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
+                  <div>收费员：{{info.charge_admin.user_name}}</div>
+                  <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
               </div>
           </div>
 
+      </div>
+      <div v-else id='prescription-print' class="prescription-print">
+        <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
+            <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
+            <div class="infoMain">
+                <div class="infoP">医院(药店)编号：{{balanceAccounts.org_config.code}}</div>
+                <div class="infoP">名称：{{balanceAccounts.org_config.org_name}}</div>
+                <div class="infoP">医生工号：</div>
+                <div class="infoP">门诊流水号：{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</div>
+                <div class="infoP">科别: {{balanceAccounts.order.department_name ? balanceAccounts.order.department_name : ''}}</div>
+                <div class="infoP">处方单据号：{{balanceAccounts.order.number ? balanceAccounts.order.number : ''}}</div>
+                <div class="infoP">姓名：{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</div>
+                <div class="infoP">医疗账号：</div>
+                <div class="infoP">医疗类别：自费</div>
+            </div>
+            <div class="chargeBox">
+                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                    <div class="chargeUl" style="width:20%;">
+                        <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                        <p style="width:50%;border-right:1px solid #000;">金额</p>
+                    </div>
+                    <div class="chargeUl" style="width:80%;">
+                        <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                        <p style="width:15%;border-right:1px solid #000;">规格</p>
+                        <p style="width:15%;border-right:1px solid #000;">数量</p>
+                        <p style="width:15%;border-right:1px solid #000;">单价</p>
+                        <p style="width:15%;">金额</p>
+                    </div>
+                </div>
+                <div style="display:flex;justify-content: space-between;">
+                    <div style="width:20%;">
+                        <div class="chargeUl" v-for="(item,i) in balanceAccounts.new_detail_list" :key="i">
+                            <p style="width:50%;">
+                              <span v-if="item.type == 1">药品费</span>
+                              <span v-if="item.type == 2">治疗费</span>
+                              <span v-if="item.type == 3">耗材费</span>
+                            </p>
+                            <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">费用合计</p>
+                            <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">记账支付</p>
+                            <p style="width:50%;">0元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">个人账号</p>
+                            <p style="width:50%;">0元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                            <p style="width:50%;">现金支付</p>
+                            <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                        </div>
+                    </div>
+                    <div style="width:80%;max-height:500px;">
+                        <div style="display:flex;" v-for="(item,i) in balanceAccounts.order_info.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
+                            <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                <p class="chargeP">
+                                    <span v-if='item.advice_id > 0'>{{item.advice.advice_name}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span v-if='item.advice_id > 0'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{item.cnt}}次</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{item.pric}}元</span>
+                                </p>
+                            </div>
+                            <div style="width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+            <div class="moneyBox">
+                <p>实收金：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                <p>记账前金额：{{0.00}}元</p>
+                <p>扣款金额：{{0.00}}元</p>
+                <p>记账后金额：{{0.00}}元</p>
+                <p>找赎金：{{0.00}}元</p>
+            </div>
+            <div class="actionBar">
+                <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
+                <div>日期：{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
+            </div>
         </div>
-    </div>
+
+      </div>
+  </div>
 
 </template>
 <script>
-  import axios from 'axios'
-  import { getChargePrint } from '@/api/project/project'
-  import { uParseTime } from '@/utils/tools'
-
-  export default {
-    data() {
-      return {
-        list: {},
-        prescription: [],
-        patient: {},
-        orgname: '',
-
-        result: {},
-        org_code: '',
-        patient_name: '',
-        doctor_code: '',
-        doctor_name: '',
-
-        name_arr: [],
-        spec_arr: [],
-        count_arr: [],
-        price_arr: [],
-        total_arr: [],
-
-        page:1,
-        pageArr:[],
+import axios from 'axios'
+import { getChargePrint } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  data() {
+    return {
+      list: {},
+      prescription: [],
+      patient: {},
+      orgname: '',
+
+      result: {},
+      org_code: '',
+      patient_name: '',
+      doctor_code: '',
+      doctor_name: '',
+
+      name_arr: [],
+      spec_arr: [],
+      count_arr: [],
+      price_arr: [],
+      total_arr: [],
+
+      page:1,
+      pageArr:[],
 
-      }
-    },
-    props: {
-      paramsObj: Object,
-      info: Object,
-      balanceAccounts:Object
-    },
-    methods: {
-      getItemName(number) {
-        switch (number) {
-          case '01':
-            return '床位费'
-            break
-          case '02':
-            return '西药费'
-
-            break
-          case '03':
-            return '中药费'
-
-            break
-          case '04':
-            return '中成药费'
-
-            break
-          case '05':
-            return '中草药费'
-
-            break
-          case '06':
-            return '检查费'
-
-            break
-          case '07':
-            return '治疗费'
-
-            break
-          case '08':
-            return '放射费'
-
-            break
-          case '09':
-            return '手术费'
-
-            break
-          case '10':
-            return '化验费'
-
-            break
-          case '11':
-            return '输血费'
-
-            break
-          case '12':
-            return '输氧费'
-
-            break
-          case '13':
-            return '其它费'
-
-            break
-          case '14':
-            return '麻醉费'
-
-            break
-          case '15':
-            return '材料费'
-
-            break
-          case '16':
-            return '特殊检查费'
-
-            break
-          case '17':
-            return '特殊治疗费'
-
-            break
-          case '18':
-            return '诊疗费(诊查费)'
-
-            break
-          case '19':
-            return '护理费'
-
-            break
-          case '20':
-            return '诊金'
-
-            break
-          case '21':
-            return '检查费（CT）'
-
-            break
-          case '22':
-            return '检查费（MRT）'
-
-            break
-          case '23':
-            return '检查费（其他）'
-
-            break
-          case '24':
-            return '特需服务费'
-
-            break
-          case '25':
-            return '杂费'
-
-            break
-          case '26':
-            return '挂号费'
-            break
+    }
+  },
+  props: {
+    paramsObj: Object,
+    info: Object,
+    balanceAccounts:Object
+  },
+  methods: {
+    getItemName(number) {
+      switch (number) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '西药费'
+
+          break
+        case '03':
+          return '中药费'
+
+          break
+        case '04':
+          return '中成药费'
+
+          break
+        case '05':
+          return '中草药费'
+
+          break
+        case '06':
+          return '检查费'
+
+          break
+        case '07':
+          return '治疗费'
+
+          break
+        case '08':
+          return '放射费'
+
+          break
+        case '09':
+          return '手术费'
+
+          break
+        case '10':
+          return '化验费'
+
+          break
+        case '11':
+          return '输血费'
+
+          break
+        case '12':
+          return '输氧费'
+
+          break
+        case '13':
+          return '其它费'
+
+          break
+        case '14':
+          return '麻醉费'
+
+          break
+        case '15':
+          return '材料费'
+
+          break
+        case '16':
+          return '特殊检查费'
+
+          break
+        case '17':
+          return '特殊治疗费'
+
+          break
+        case '18':
+          return '诊疗费(诊查费)'
+
+          break
+        case '19':
+          return '护理费'
+
+          break
+        case '20':
+          return '诊金'
+
+          break
+        case '21':
+          return '检查费（CT）'
+
+          break
+        case '22':
+          return '检查费（MRT）'
+
+          break
+        case '23':
+          return '检查费（其他）'
+
+          break
+        case '24':
+          return '特需服务费'
+
+          break
+        case '25':
+          return '杂费'
+
+          break
+        case '26':
+          return '挂号费'
+          break
 
-        }
+      }
 
-      },
-      getPage(){
-        if(this.paramsObj.balance_accounts_type != 2){
-          this.page = 1
-          this.pageArr = []
-          if(this.info.order_infos.length <= 13){
-              this.page = 1
-              this.pageArr.push(this.info.order_infos.length)
-              console.log('this.pageArr',this.pageArr)
-          }else if(this.info.order_infos.length > 13){
-              this.page = parseInt(this.info.order_infos.length / 13)
-              let num = this.info.order_infos.length % 13
-              for (var i=0;i<this.page;i++){
-                  this.pageArr.push(13)
-              }
-              if(num != 0){
-                  this.pageArr.push(num)
-              }
-          }
-        }else{
-          this.page = 1
-          this.pageArr = []
-          if(this.balanceAccounts.order_info.length <= 13){
-              this.page = 1
-              this.pageArr.push(this.balanceAccounts.order_info.length)
-              console.log('this.pageArr',this.pageArr)
-          }else if(this.balanceAccounts.order_info.length > 13){
-              this.page = parseInt(this.balanceAccounts.order_info.length / 13)
-              let num = this.balanceAccounts.order_info.length % 13
-              for (var i=0;i<this.page;i++){
-                  this.pageArr.push(13)
-              }
-              if(num != 0){
-                  this.pageArr.push(num)
-              }
-          }
+    },
+    getPage(){
+      if(this.paramsObj.balance_accounts_type != 2){
+        this.page = 1
+        this.pageArr = []
+        if(this.info.order_infos.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.info.order_infos.length)
+            console.log('this.pageArr',this.pageArr)
+        }else if(this.info.order_infos.length > 13){
+            this.page = parseInt(this.info.order_infos.length / 13)
+            let num = this.info.order_infos.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
         }
-
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-          return uParseTime(value, temp)
+      }else{
+        this.page = 1
+        this.pageArr = []
+        if(this.balanceAccounts.order_info.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.balanceAccounts.order_info.length)
+            console.log('this.pageArr',this.pageArr)
+        }else if(this.balanceAccounts.order_info.length > 13){
+            this.page = parseInt(this.balanceAccounts.order_info.length / 13)
+            let num = this.balanceAccounts.order_info.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
         }
-        return ''
       }
-    },
-    created() {
-
 
     },
-    watch:{
-      info: {
-        handler(newVal) {
-            this.getPage()
-        },
-        deep: true,
-      },
-      balanceAccounts(){
-        this.getPage()
-      },
-      deep: true
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
     }
+  },
+  created() {
+
 
+  },
+  watch:{
+    info: {
+      handler(newVal) {
+          this.getPage()
+      },
+      deep: true,
+    },
+    balanceAccounts(){
+      this.getPage()
+    },
+    deep: true
   }
+
+}
 </script>
 
 
 <style lang="scss" scoped>
-    .prescription-print {
-        -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-        -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        margin-bottom: 20px;
-        padding: 20px 10px;
-    }
+  .prescription-print {
+      -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+      -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      margin-bottom: 20px;
+      padding: 20px 10px;
+  }
 
-    .printTitle {
-        font-size: 22px;
-        text-align: center;
-        font-weight: bold;
-    }
+  .printTitle {
+      font-size: 22px;
+      text-align: center;
+      font-weight: bold;
+  }
 
-    .infoMain {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 0 10px;
-        margin-top: 10px;
-    }
+  .infoMain {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 0 10px;
+      margin-top: 10px;
+  }
 
-    .infoMain .infoP {
-        width: 33%;
-        line-height: 24px;
-    }
+  .infoMain .infoP {
+      width: 33%;
+      line-height: 24px;
+  }
 
-    .chargeBox {
-        border: 1px solid #000;
-    }
+  .chargeBox {
+      border: 1px solid #000;
+  }
 
-    .chargeUl {
-        display: flex;
-        justify-content: space-between;
-        text-align: center;
-    }
+  .chargeUl {
+      display: flex;
+      justify-content: space-between;
+      text-align: center;
+  }
 
-    .chargeUl p {
-        height: 40px;
-        line-height: 40px;
-    }
+  .chargeUl p {
+      height: 40px;
+      line-height: 40px;
+  }
 
-    .chargeP {
-        height: 40px;
-        line-height: 40px;
-    }
+  .chargeP {
+      height: 40px;
+      line-height: 40px;
+  }
 
-    .moneyBox {
-        display: flex;
-        justify-content: space-between;
-        padding: 0 10px;
-        background: #eee;
-        height: 40px;
-        align-items: center;
-        border: 1px solid #000;
-        border-top: none
-    }
+  .moneyBox {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 10px;
+      background: #eee;
+      height: 40px;
+      align-items: center;
+      border: 1px solid #000;
+      border-top: none
+  }
 
-    .actionBar {
-        display: flex;
-        justify-content: space-between;
-        line-height: 24px;
-        padding: 0 10px;
-    }
+  .actionBar {
+      display: flex;
+      justify-content: space-between;
+      line-height: 24px;
+      padding: 0 10px;
+  }
 
-    .actionBar div {
-        width: 150px;
-    }
+  .actionBar div {
+      width: 150px;
+  }
 </style>

src/xt_pages/outpatientTool/components/settle.vue

               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="其他支付">
+          <template slot-scope="scope">{{scope.row.oth_pay.toFixed(2)}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="公务员医疗补助资金支出">
+          <template slot-scope="scope">{{scope.row.cvlserv_pay.toFixed(2)}}</template>
+        </el-table-column>
+
         <el-table-column align="center" prop="item_name" label="微信支付">
           <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
         </el-table-column>
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 15) {
+        if (columnIndex === 0 || columnIndex === 1) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/xt_pages/user/doctorAdvice.vue

       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
+     
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
+        console.log("_row--------------",_row)
+        console.log("_col",_col)
         return {
           rowspan: _row,
           colspan: _col
       },
   },
   watch: {
+
     adviceTableData: function() {
+      console.log("hhahahhahah",this.adviceTableData)
       this.handleSpanTempArr();
     },
     "selectedTemp.list": function() {