Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/addInspection.vue

@@ -79,7 +79,11 @@
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单位" width="120">
-                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
+                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
                         <template slot-scope="scope">{{scope.row.price}}</template>
@@ -163,6 +167,14 @@
       }
     },
     methods: {
+      getUnit(id){
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i = 0;i < arr.length; i++){
+          if(id == arr[i].id){
+            return arr[i].name
+          }
+        }
+      },
       changeProject() {
         this.form.number = 1
 

src/xt_pages/data/components/editInspection.vue

@@ -78,7 +78,10 @@
                         <template slot-scope="scope">{{scope.row.number}}</template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单位" width="120">
-                        <template slot-scope="scope">{{scope.row.unit}}</template>
+                        <template slot-scope="scope">
+                            <div v-if="scope.row.type == 2">{{scope.row.unit}}</div>
+                            <div v-if="scope.row.type == 3">{{getUnit(scope.row.unit)}}</div>
+                        </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="单价" width="120">
                         <template slot-scope="scope">{{scope.row.price}}</template>
@@ -166,6 +169,14 @@
       }
     },
     methods: {
+      getUnit(id){
+        var arr =  getDataConfig('hemodialysis','units')
+        for(let i = 0;i < arr.length; i++){
+          if(id == arr[i].id){
+            return arr[i].name
+          }
+        }
+      },
       changeProject() {
         this.form.number = 1
 

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -76,7 +76,7 @@
           </ul>
         </div>
       </div>
-     
+
      <div class="cell clearfix">
         <label class="title"> <span class="name">给药途径</span> : </label>
         <div class="time">
@@ -92,8 +92,8 @@
           </ul>
         </div>
       </div>
-    
-      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+
+      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
@@ -222,7 +222,7 @@
           </template>
         </el-table-column>
       </el-table>
-         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
         :span-method="objectSpanMethod"
@@ -450,7 +450,7 @@ export default {
     },
 
     selectSchedulType(scheduleType) {
-     
+
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
       console.log("班次",this.listQuery.schedul_type)
@@ -462,7 +462,7 @@ export default {
       console.log("分区",this.listQuery.partition_type)
       this.requestSchedualDoctors(this.time);
     },
-    
+
     selectDeliveryWay(val){
        this.delivery_way = val
        this.requestSchedualDoctors(this.time)
@@ -489,7 +489,7 @@ export default {
       });
     },
     requestSchedualDoctors (time) {
-        
+
         var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
             if(this.delivery_way == this.deliveryWay[i].id){
@@ -501,10 +501,10 @@ export default {
         }
 
         let newTime =  moment(time).format('YYYY-MM-DD')
-       
+
          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}).then(rs => {
         var resp = rs.data
@@ -525,16 +525,16 @@ export default {
                     projectArr.push(item)
                   }
                 })
-                
+
               })
-              
+
               resp.data.hisAdvices.map((item,index) => {
                 if(projectArr[index].project.length > 0){
                   projectArr[index].project.map(it => {
                     let obj = {
                       advice_doctor: it.doctor,
                       start_time:it.start_time,
-                      advice_name: 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.good_info.good_name,
                       execution_time:it.execution_time,
                       execution_state:it.execution_state,
                       execution_staff:it.execution_staff,
@@ -597,7 +597,7 @@ export default {
                     }
                 })
             }
-            
+
             console.log("分区",this.partitionType)
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
@@ -660,8 +660,8 @@ export default {
                     }
                 })
             }
-            
-            
+
+
             if(this.partitionType == 0){
                 this.scheduleMap = newSchedules
             }else {
@@ -735,7 +735,7 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].patient_id);
       }
-  
+
       this.$store.dispatch("SetAdviceIDs", sch_ids);
        var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
@@ -760,7 +760,7 @@ export default {
       for (let index = 0; index < this.selecting_schs.length; index++) {
         sch_ids.push(this.selecting_schs[index].patient_id);
       }
-  
+
       this.$store.dispatch("SetAdviceIDs", sch_ids);
        var name = ""
         for(let i=0;i<this.deliveryWay.length;i++){
@@ -851,7 +851,7 @@ export default {
                 }
             }
         }
-        
+
         if (columnIndex === 1) {
             let index = this.indexInfoList.findIndex(item => {  //遍历数组
                 return item.firstIndex === rowIndex
@@ -939,7 +939,7 @@ export default {
         }
 
         if (isChild == 1) {
-          // 不是子药 
+          // 不是子药
           // console.log(tempDrugSpecDesc)
           // console.log(tempPrescribingNumberDesc)
           // console.log(tempSingleDoseDesc)
@@ -972,7 +972,7 @@ export default {
         // console.log('val',val)
         this.selecting_schs = val;
     },
-    
+
   },
   components: {
     BreadCrumb

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1607,7 +1607,7 @@
               }
             }
 
-            total =total.toFixed(2)
+            total =total.toFixed(4)
           }
         }
         return total
@@ -1637,7 +1637,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
       getCurTotal() {
@@ -1652,9 +1652,9 @@
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
           }
-          return total.toFixed(2)
-        }
+          return total.toFixed(4)
 
+        }
       },
       getTotal() {
         var total = 0
@@ -1677,7 +1677,7 @@
           }
         }
 
-        return total.toFixed(2)
+        return total.toFixed(4)
       }, getMonthTotal() {
         var total = 0
         for (let i = 0; i < this.month_prescriptions.length; i++) {
@@ -1699,7 +1699,7 @@
           }
         }
 
-        return total.toFixed(2)
+        return total.toFixed(24)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -1210,7 +1210,7 @@
             total = parseFloat(total) + parseFloat(this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       }, getMonthTotalOne() {
         var total = 0
@@ -1235,7 +1235,7 @@
             total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.addition[b].price * this.curMonthPrescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
       getTotal() {
@@ -1258,7 +1258,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       }, getTotalTwo() {
         var total = 0
@@ -1281,7 +1281,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
       moreState(tab, event) {

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -82,7 +82,7 @@
 
             <div class="actionBar">
                 <div>执行医生：{{item.doctor?item.doctor:''}}</div>
-                <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+                <div>费用：{{getTotalOne(item.id).toFixed(4)?getTotalOne(item.id).toFixed(4):''}}元</div>
             </div>
 
             <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -23,7 +23,7 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
-            <div style="position: absolute;top:90px;left:290px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:90px;left:290px;">{{ (totalPrice - list.psn_cash_money).toFixed(4) }}</div>
             <div style="position: absolute;top:90px;left:460px;">{{ list.psn_cash_money }}</div>
             <div style="position: absolute;top:90px;left:640px;">门慢结算</div>
         </div>
@@ -102,7 +102,7 @@
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
+            <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(4) }}</span>
         </div>
         <div style="position: absolute;top:280px;left:460px">现金：{{ list.psn_cash_money }}</div>
         <div>

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -193,8 +193,8 @@
                 scanStyles: false
               });
             }
-            
-            
+
+
           },500)
         }else{
           const style =
@@ -232,7 +232,7 @@
 
               return false
             } else {
-              
+
               this.balanceAccounts = response.data.data
               let arr = []
               let obj = {
@@ -250,18 +250,32 @@
                 details: [],
                 total: 0
               }
+
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
               let num = 0
               this.balanceAccounts.order_info.map(item => {
-                
+
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
                   num++
                 }else{
                   if(item.project.type == 2){
-                    obj2.details.push(item)
-                    obj2.total += (item.pric * item.project.count)
-                    num++
+                    if (item.project.team_id > 0) {
+                      obj2.details.push(item)
+                      obj2.total += (item.pric * item.project.count)
+                      num++
+                    }else{
+                      obj2.details.push(item)
+                      obj2.total += (item.pric * item.project.count)
+                      num++
+
+                    }
+
                   }else{
                     obj3.details.push(item)
                     obj3.total += (item.pric * item.project.count)
@@ -343,8 +357,7 @@
                       price_arr.push(that.info.transBody.outputlist1[i].akc225);
                       total_arr.push(that.info.transBody.outputlist1[i].akc264)
                     }
-
-                    console.log("～～～" + that.info);
+                    
 
                     that.info['name_arr'] = name_arr;
                     that.info['spec_arr'] = spec_arr;
@@ -353,7 +366,6 @@
                     that.info['total_arr'] = total_arr;
                     that.info['record_date'] = obj.record_time;
 
-                    console.log("～～" + that.info)
 
                     let type_arr = []
                     for (let i = 0; i < that.info.transBody.outputlist1.length; i++) {
@@ -378,7 +390,7 @@
                         }
                       }
                       that.info.new_detail_list.push(obj)
-                      
+
                     }
                     let num = 0
                     that.info.new_detail_list.map(item => {
@@ -419,7 +431,7 @@
                     }
                     console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-                    
+
                   }
                 }
               })
@@ -450,7 +462,7 @@
 
     created() {
       this.org_id = this.$store.getters.xt_user.org_id
-      
+
       this.getInfo(this.paramsObj)
     },
     watch:{

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1804,7 +1804,7 @@
             total = parseFloat(total) + parseFloat(this.curPrescriptions.addition[b].price * this.curPrescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
       getTotalThree(big_prescriptions) {
@@ -1830,7 +1830,7 @@
             total = parseFloat(total) + parseFloat(big_prescriptions.curPrescriptions.addition[b].price * big_prescriptions.curPrescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
 
@@ -1857,7 +1857,7 @@
             total = parseFloat(total) + parseFloat(this.curMonthPrescriptions.addition[b].price * this.curMonthPrescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
       getMonthTotalTwo(month_prescriptions) {
@@ -1883,7 +1883,7 @@
             total = parseFloat(total) + parseFloat(month_prescriptions.addition[b].price * month_prescriptions.addition[b].count)
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       },
 
@@ -1909,7 +1909,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       }, getTotalTwo() {
         var total = 0
@@ -1932,7 +1932,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
 
       }, getTotalFour(month_prescriptions) {
         var total = 0
@@ -1954,7 +1954,7 @@
             }
           }
         }
-        return total.toFixed(2)
+        return total.toFixed(4)
       },
       moreState(tab, event) {
         if (tab == 'more') {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -15,7 +15,7 @@
       <div class='dialysisPage' style="padding-top:40px;">
         <div v-if="org_id == 9990 || org_id == 10138 || org_id == 9504 || org_id == 10028 || org_id == 0">
           <printTwo :info="info" v-if="org_id == 9990"></printTwo>
-          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138"></printThree>
+          <printThree :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts" v-if="org_id == 10138 || org_id == 0"></printThree>
           <printFour v-if="org_id == 9504 || org_id == 10028 || org_id == 0" :info="info" :paramsObj="paramsObj" :balanceAccounts="balanceAccounts"></printFour>
         </div>
         <printOne :info="info" v-else></printOne>
@@ -79,7 +79,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
 
-      if(this.$store.getters.xt_user.org_id == 10138){
+      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0){
         setTimeout(() => {
           const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';
@@ -301,7 +301,7 @@ export default {
           id: obj.order_id,
 
         }
-        if(this.org_id == 10138){
+        if(this.org_id == 10138 || this.org_id == 0){
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)
@@ -327,8 +327,13 @@ export default {
                 total: 0
               }
               let num = 0
-              this.balanceAccounts.order_info.map(item => {
 
+              let obj4 = {
+                type:4,
+                details: [],
+                total: 0
+              }
+              this.balanceAccounts.order_info.map(item => {
                 if(item.advice_id > 0){
                   obj.details.push(item)
                   obj.total += (item.pric * item.advice.prescribing_number)
@@ -345,10 +350,20 @@ export default {
                   }
                 }
               })
+              this.balanceAccounts.new_order_info.map(item => {
+                    obj4.total = item.Total
+                     obj4.details.push(item)
+                     num++
+
+
+              })
+
               this.balanceAccounts.new_detail_list = []
               this.balanceAccounts.new_detail_list.push(obj)
               this.balanceAccounts.new_detail_list.push(obj2)
               this.balanceAccounts.new_detail_list.push(obj3)
+              this.balanceAccounts.new_detail_list.push(obj4)
+
               console.log(111,this.balanceAccounts)
               this.num = num
               console.log('this.num',this.num)

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -111,7 +111,7 @@
                                 </div>
                                 <div style="width:15%;text-align:center;">
                                     <p class="chargeP">
-                                        <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
+                                        <span>{{(item.cnt * item.pric).toFixed(4)}}元</span>
                                     </p>
                                 </div>
                             </div>
@@ -216,7 +216,7 @@
                               </div>
                               <div style="width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
+                                      <span>{{(item.cnt * item.pric).toFixed(4)}}元</span>
                                   </p>
                               </div>
                           </div>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -1,216 +1,281 @@
 <template>
     <div>
-        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print" style="position: relative;">
+        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print"
+             style="position: relative;">
             <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
-                <div>单据号：<span style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span></div>
-                <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span></div>
-                <div style="margin-left:2px;">电脑号：<span style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
+                <div>单据号：<span
+                        style="display:inline-block;width:200px;">{{info.order_number ? info.order_number : ''}}</span>
+                </div>
+                <div>透析号：<span style="display:inline-block;width:200px;">{{info.patient.dialysis_no ? info.patient.dialysis_no : ''}}</span>
+                </div>
+                <div style="margin-left:2px;">电脑号：<span
+                        style="display:inline-block;">{{info.psn_no ? info.psn_no : ''}}</span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient.name ? info.patient.name.indexOf("（") > -1 ? info.patient.name.substring(0,info.patient.name.indexOf("（")) : info.patient.name : ''}}</span></div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{info.patient.gender == '1' ? '男' : '女'}}</span></div>
-                  <div>年龄：<span style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span></div>
-                  <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
-                  </div>
-                  <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
+                    <div>姓名：<span style="display:inline-block;width:50px;">{{info.patient.name ? info.patient.name.indexOf('（') > -1 ? info.patient.name.substring(0,info.patient.name.indexOf('（')) : info.patient.name : ''}}</span>
+                    </div>
+                    <div>性别：<span
+                            style="display:inline-block;width:30px;">{{info.patient.gender == '1' ? '男' : '女'}}</span>
+                    </div>
+                    <div>年龄：<span
+                            style="display:inline-block;width:50px;">{{info.patient.age ? info.patient.age : ''}}岁</span>
+                    </div>
+                    <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
+                    </div>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                    </div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
             <div style="min-height: 300px;">
-              <table border='1' style="width:100%;" cellspacing="0">
-                  <tr>
-                      <td width="70">类别</td>
-                      <td>项目</td>
-                      <td min-width="180" style="min-width:60px;">规格</td>
-                      <td width="40">单位</td>
-                      <td width="40">数量</td>
-                      <td width="60">单价</td>
-                      <td width="70">总额</td>
-                      <td width="130">小计</td>
-                  </tr>
-                  <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
-                      <tr v-for="(subItem,index) in item.details" :key="index">
-                        <td>
-                          <span v-if="item.type == 1">药品费</span>
-                          <span v-if="item.type == 2">治疗费</span>
-                          <span v-if="item.type == 3">耗材费</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1"><span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
-                          <span v-if="item.type == 2"></span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                <table border='1' style="width:100%;" cellspacing="0">
+                    <tr>
+                        <td width="70">类别</td>
+                        <td>项目</td>
+                        <td min-width="180" style="min-width:60px;">规格</td>
+                        <td width="40">单位</td>
+                        <td width="40">数量</td>
+                        <td width="60">单价</td>
+                        <td width="70">总额</td>
+                        <td width="130">小计</td>
+                    </tr>
+                    <div v-for="(item,i) in info.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
+                        <tr v-for="(subItem,index) in item.details" :key="index">
+                            <td>
+                                <span v-if="item.type == 1">药品费</span>
+                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 3">耗材费</span>
+                                <span v-if="item.type == 4">检验费</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                                <span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1"><span
+                                        v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
+                                <span v-if="item.type == 2"></span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 2">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(4) }}</span>
+                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td :rowspan="item.details.length" v-if="index == 0"
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(4) }}
+                            </td>
+                        </tr>
+                    </div>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
+                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(4) }}</span>
+                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(4) }}</span>
+                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(4) }}</span>
+                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>
+
+                                </div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.count }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                        <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                    </tr>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
+                                <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</div>
+                                <div style="width:33%;">基金支付金额：{{info.hifp_pay?info.hifp_pay:0}}元</div>
+                                <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:0}}元</div>
+
+                            </div>
+                            <div style="display:flex;flez-wrap:wrap;font-size:16px;">
+                                <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
+                                <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 2">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                        </td>
-                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
-                      </tr>
-                  </div>
-                  <tr>
-                    <td colspan="7">
-                      <div style="display:flex;flez-wrap:wrap;">
-                        <div style="width:33%;" v-for="(item,index) in info.new_detail_list" :key="index">
-                          <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                        </div>
-                      </div>
-                    </td>
-                    <td>合计: {{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
-                  </tr>
-                  <tr>
-                      <td colspan="7">
-                          <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
-                              <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">基金支付金额：{{info.hifp_pay?info.hifp_pay:0}}元</div>
-                              <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:0}}元</div>
-
-                          </div>
-                          <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                              <div style="width:33%;">个人支付金额：{{ info.psn_pay?info.psn_pay:0 }}元</div>
-                              <div style="width:33%;">个人账户金额：{{info.balc >= 0 ? info.balc : 0 }}元</div>
-                          </div>
-                      </td>
-                      <td style="font-size:16px;">合计：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
-                  </tr>
-
-              </table>
+                        <td style="font-size:16px;">合计：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</td>
+                    </tr>
+
+                </table>
             </div>
             <div style="float:right;margin:10px 0;display:flex;">
                 <div>操作人：<span style="width:100px;display:inline-block;">{{info.p_admin.user_name}}</span></div>
-                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span></div>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</span>
+                </div>
             </div>
             <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
         <div v-else id='prescription-print' class="prescription-print" style="position: relative;">
-          <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
+            <img style="width:100%;height:80px" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">
             <div class="printTitle" style="position: absolute;left: 40%;top: 50px;">门诊收费清单</div>
             <div style="display:flex;">
-                <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span></div>
-                <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span></div>
+                <div>单据号：<span style="display:inline-block;width:200px;">{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</span>
+                </div>
+                <div>透析号：<span style="display:inline-block;width:200px;">{{balanceAccounts.patient ? balanceAccounts.patient.dialysis_no : ''}}</span>
+                </div>
                 <div>电脑号：<span style="display:inline-block;width:80px;"></span></div>
             </div>
             <div style="display:flex;justify-content: space-between;">
                 <div style="display:flex;">
-                  <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf("（") > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf("（")) : balanceAccounts.patient.name : ''}}</span></div>
-                  <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span></div>
-                  <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span></div>
-                  <div>费别：<span style="display:inline-block;width:80px;">自费</span>
-                  </div>
-                  <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                    <div>姓名：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.name.indexOf('（') > -1 ? balanceAccounts.patient.name.substring(0,balanceAccounts.patient.name.indexOf('（')) : balanceAccounts.patient.name : ''}}</span>
+                    </div>
+                    <div>性别：<span style="display:inline-block;width:30px;">{{balanceAccounts.patient.gender == '1' ? '男' : '女'}}</span>
+                    </div>
+                    <div>年龄：<span style="display:inline-block;width:50px;">{{balanceAccounts.patient ? balanceAccounts.patient.age : ''}}岁</span>
+                    </div>
+                    <div>费别：<span style="display:inline-block;width:80px;">自费</span>
+                    </div>
+                    <div>收费日期：<span style="display:inline-block;width:100px;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
+                    </div>
                 </div>
                 <div style="float:right">金额单位：元</div>
             </div>
             <div style="min-height: 300px;">
-              <table border='1' style="width:100%;" cellspacing="0">
-                  <tr>
-                      <td width="70">类别</td>
-                      <td>项目</td>
-                      <td min-width="180" style="min-width:60px;">规格</td>
-                      <td width="40">单位</td>
-                      <td width="40">数量</td>
-                      <td width="60">单价</td>
-                      <td width="70">总额</td>
-                      <td width="130">小计</td>
-                  </tr>
-                  <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i" style="width:100%;display: table-row-group;">
-                      <tr v-for="(subItem,index) in item.details" :key="index">
-                        <td>
-                          <span v-if="item.type == 1">药品费</span>
-                          <span v-if="item.type == 2">治疗费</span>
-                          <span v-if="item.type == 3">耗材费</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1"><span v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
-                          <span v-if="item.type == 2"></span>
-                          <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                <table border='1' style="width:100%;" cellspacing="0">
+                    <tr>
+                        <td width="70">类别</td>
+                        <td>项目</td>
+                        <td min-width="180" style="min-width:60px;">规格</td>
+                        <td width="40">单位</td>
+                        <td width="40">数量</td>
+                        <td width="60">单价</td>
+                        <td width="70">总额</td>
+                        <td width="130">小计</td>
+                    </tr>
+                    <div v-for="(item,i) in balanceAccounts.new_detail_list" :key="i"
+                         style="width:100%;display: table-row-group;">
+                        <tr v-for="(subItem,index) in item.details" :key="index">
+                            <td>
+                                <span v-if="item.type == 1">药品费</span>
+                                <span v-if="item.type == 2">治疗费</span>
+                                <span v-if="item.type == 3">耗材费</span>
+                                <span v-if="item.type == 4">检验费</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
+                                <span v-if="item.type == 4">{{ subItem.Name }}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1"><span
+                                        v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
+                                <span v-if="item.type == 2"></span>
+                                <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
+                                <span v-if="item.type == 4"></span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
+                                <span v-if="item.type == 2">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                                <span v-if="item.type == 4">1</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 2">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 3">{{ subItem.pric }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                            </td>
+                            <td>
+                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
+
+                            </td>
+                            <td :rowspan="item.details.length" v-if="index == 0"
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
+                            </td>
+                        </tr>
+                    </div>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
+                                     :key="index">
+                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
+                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>
+
+                                </div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
-                          <span v-if="item.type == 2">{{ subItem.project.count }}</span>
-                          <span v-if="item.type == 3">{{ subItem.project.count }}</span>
+                        <td>合计: {{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                    </tr>
+                    <tr>
+                        <td colspan="7">
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;">
+                                    医疗费总额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元
+                                </div>
+                                <div style="width:33%;">基金支付金额：0元</div>
+                                <div style="width:33%;">个人账户支付金额：0元</div>
+
+                            </div>
+                            <div style="display:flex;flez-wrap:wrap;">
+                                <div style="width:33%;">
+                                    个人支付金额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元
+                                </div>
+                                <div style="width:33%;">个人账户金额：0元</div>
+                            </div>
                         </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 2">{{ subItem.pric }}</span>
-                          <span v-if="item.type == 3">{{ subItem.pric }}</span>
-                        </td>
-                        <td>
-                          <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                          <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
-                        </td>
-                        <td :rowspan="item.details.length" v-if="index == 0" style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}</td>
-                      </tr>
-                  </div>
-                  <tr>
-                    <td colspan="7">
-                      <div style="display:flex;flez-wrap:wrap;">
-                        <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list" :key="index">
-                          <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
-                          <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
-                        </div>
-                      </div>
-                    </td>
-                    <td>合计: {{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
-                  </tr>
-                  <tr>
-                      <td colspan="7">
-                          <div style="display:flex;flez-wrap:wrap;">
-                              <div style="width:33%;">医疗费总额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">基金支付金额：0元</div>
-                              <div style="width:33%;">个人账户支付金额：0元</div>
-
-                          </div>
-                          <div style="display:flex;flez-wrap:wrap;">
-                              <div style="width:33%;">个人支付金额：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</div>
-                              <div style="width:33%;">个人账户金额：0元</div>
-                          </div>
-                      </td>
-                      <td>合计：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
-                  </tr>
-
-              </table>
+                        <td>合计：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</td>
+                    </tr>
+
+                </table>
             </div>
             <div style="float:right;margin:10px 0;display:flex;">
-                <div>操作人：<span style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span></div>
-                <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),"{y}-{m}-{d}")?getTime(new Date(),"{y}-{m}-{d}"):""}}</span></div>
+                <div>操作人：<span
+                        style="width:100px;display:inline-block;">{{balanceAccounts.current_admin.user_name}}</span>
+                </div>
+                <div>操作日期：<span style="width:100px;display:inline-block;">{{getTime(new Date(),'{y}-{m}-{d}')?getTime(new Date(),'{y}-{m}-{d}'):''}}</span>
+                </div>
             </div>
             <img style="width:100%;" src="https://kuyi.shengws.com/bailin/blend.jpg" alt="">
         </div>
@@ -246,7 +311,7 @@
     props: {
       paramsObj: Object,
       info: Object,
-      balanceAccounts:Object
+      balanceAccounts: Object
     },
     methods: {
       getName(list) {
@@ -258,62 +323,62 @@
         }
 
         switch (new_list[0].bcc334) {
-          case "A31001":
-            return "深圳医保1档"
+          case 'A31001':
+            return '深圳医保1档'
             break
-          case "A31002":
-            return "深圳医保2档"
+          case 'A31002':
+            return '深圳医保2档'
 
             break
-          case "A31003":
-            return "深圳医保3档"
+          case 'A31003':
+            return '深圳医保3档'
 
             break
-          case "A31004":
-            return "二档（少儿）"
+          case 'A31004':
+            return '二档（少儿）'
 
             break
-          case "A31005":
-            return "学生二档"
+          case 'A31005':
+            return '学生二档'
 
             break
-          case "A31006":
-            return "大学生二档"
+          case 'A31006':
+            return '大学生二档'
 
             break
-          case "A32001":
-            return "在职公务员"
+          case 'A32001':
+            return '在职公务员'
             break
-          case "A32002":
-            return "在职驻深公务员"
+          case 'A32002':
+            return '在职驻深公务员'
 
             break
-          case "A39301":
-            return "家属统筹医疗"
+          case 'A39301':
+            return '家属统筹医疗'
 
             break
-          case "A41001":
-            return "工伤在职"
+          case 'A41001':
+            return '工伤在职'
 
             break
-          case "A51001":
-            return "生育在职"
+          case 'A51001':
+            return '生育在职'
 
             break
-          case "A52001":
-            return "生育医疗一档"
+          case 'A52001':
+            return '生育医疗一档'
 
             break
-          case "A52002":
-            return "生育医疗一档"
+          case 'A52002':
+            return '生育医疗一档'
 
             break
-          case "C31001":
-            return "一档医疗退休"
+          case 'C31001':
+            return '一档医疗退休'
 
             break
-          case "C31002":
-            return "二档医疗退休"
+          case 'C31002':
+            return '二档医疗退休'
             break
 
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1613,7 +1613,7 @@
               }
             }
 
-            total = Math.floor(total * 100) / 100
+            total = total.toFixed(4)
           }
         }
         return total
@@ -2223,7 +2223,7 @@
             for (let i = 0; i < this.prescriptions.length; i++) {
               for(let b = 0; b < this.prescriptions[i].advices.length; b++){
                 if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
-                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，开非特病类型的药")
+                  this.$message.error(this.prescriptions[i].name.toString() +"属于特病类型处方，不能开非特病类型的药")
                   return
                 }
               }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -416,7 +416,9 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
             if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
-              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，开非特病类型的药')
+              this.$message.error('处方' + (i + 1).toString() + '属于特病类型处方，不能开非特病类型的药')
+
+
               return
             }
 

src/xt_pages/outpatientDoctorStation/template/printFour.vue

@@ -55,7 +55,7 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(4)?getTotalOne(item.id).toFixed(4):0}}元</p>
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -55,7 +55,7 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(4)?getTotalOne(item.id).toFixed(4):0}}元</p>
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -82,7 +82,7 @@
 
             <div class="actionBar">
                 <div>执行医生：{{item.doctor?item.doctor:''}}</div>
-                <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
+                <div>费用：{{getTotalOne(item.id).toFixed(4)?getTotalOne(item.id).toFixed(4):''}}元</div>
             </div>
 
             <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">

src/xt_pages/outpatientTool/components/detail.vue

@@ -72,21 +72,24 @@
             <el-table-column align="center" prop="name" label="项目名称">
                 <template slot-scope="scope">{{scope.row.item_name}}</template>
             </el-table-column>
+            <el-table-column align="center" prop="name" label="规格">
+                <template slot-scope="scope">{{scope.row.item_spec}}</template>
+            </el-table-column>
             <el-table-column align="center" prop="name" label="数量">
                 <template slot-scope="scope">{{scope.row.count}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="单价">
-                <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+                <template slot-scope="scope">{{scope.row.price.toFixed(4)}}</template>
             </el-table-column>
             <el-table-column align="center" prop="name" label="费用">
                 <template slot-scope="scope">
-                    <div>{{(scope.row.price.toFixed(2)*scope.row.count).toFixed(2)}}</div>
+                    <div>{{(scope.row.price.toFixed(4)*scope.row.count).toFixed(4)}}</div>
                 </template>
             </el-table-column>
 
             <el-table-column align="center" prop="total" label="费用总额">
                 <template slot-scope="scope">
-                    <div>{{scope.row.total.toFixed(2)}}</div>
+                    <div>{{scope.row.total.toFixed(4)}}</div>
                 </template>
             </el-table-column>
 
@@ -214,26 +217,27 @@
                   newObj['price'] = orders[b].order_info[c].pric
                   if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
                     newObj['type'] = 1
-                    // newObj['item_name'] = orders[b].order_info[c].advice.advice_name
+                    newObj['item_name'] = orders[b].order_info[c].advice.advice_name
                     newObj['item_id'] = orders[b].order_info[c].advice.drug_id
 
                     if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
-                      newObj['item_name'] = orders[b].order_info[c].advice.advice_name + '（ ' + orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit + ' ）'
+                      newObj['item_spec'] =  orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit
                     } else {
 
-                      newObj['item_name'] = ''
+                      newObj['item_spec'] = ''
                     }
 
                   }
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
                     newObj['type'] = 2
                     newObj['item_id'] = orders[b].order_info[c].project.project_id
+                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
 
                     if (orders[b].order_info[c].project.type == 2) {
-                      newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+                      newObj['item_spec'] =""
 
                     } else if (orders[b].order_info[c].project.type == 3) {
-                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name + '（ ' + orders[b].order_info[c].project.good_info.specification_name + ' ）'
+                      newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
 
                     }
                   }
@@ -271,6 +275,8 @@
                 obj['price'] = project[i].price
                 obj['type'] = project[i].type
                 obj['item_name'] = project[i].item_name
+                obj['item_spec'] = project[i].item_spec
+
                 obj['item_id'] = project[i].item_id
                 obj['name'] = tempPatientsTwo[d].name
                 obj['patient_id'] = tempPatientsTwo[d].patient_id
@@ -290,6 +296,7 @@
                 obj['price'] = advice[i].price
                 obj['type'] = advice[i].type
                 obj['item_name'] = advice[i].item_name
+                obj['item_spec'] = advice[i].item_spec
                 obj['item_id'] = advice[i].item_id
                 obj['name'] = tempPatientsTwo[d].name
                 obj['patient_id'] = tempPatientsTwo[d].patient_id
@@ -303,11 +310,23 @@
               let total = 0
               for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
                 let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                new_name = new_name.replace('（ ', '')
-                new_name = new_name.replace(' ）', '')
-                if (new_name.length != 0) {
-                  total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                // console.log('3 ' + new_name)
+                if (new_name != undefined){
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].patient_id)
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].price)
+                  // console.log('3 ' + tempPatientsTwo[i].new_order_info[b].count)
+                  //
+                  // new_name = new_name.replace('（ ', '')
+                  // new_name = new_name.replace(' ）', '')
+                  if (new_name.length != 0) {
+                    total = parseFloat(total) + parseFloat((parseFloat(tempPatientsTwo[i].new_order_info[b].count.toString()) * parseFloat(tempPatientsTwo[i].new_order_info[b].price.toString().toString())).toFixed(2))
+                  }
+
+
+
                 }
+
+
               }
               tempPatientsTwo[i]['total'] = total
             }
@@ -317,13 +336,12 @@
               if (tempPatientsTwo[i].new_order_info.length > 0) {
 
                 for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
-                  let new_name = tempPatientsTwo[i].new_order_info[b].item_name
-                  console.log('2 ' + new_name)
-
-                  new_name = new_name.replace('（ ', '')
-                  new_name = new_name.replace(' ）', '')
+                  // let new_name = tempPatientsTwo[i].new_order_info[b].item_name
+                  // console.log('2 ' + new_name)
+                  //
+                  // new_name = new_name.replace('（ ', '')
+                  // new_name = new_name.replace(' ）', '')
 
-                  if (new_name.length != 0) {
                     let obj = {
                       name: tempPatientsTwo[i].name,
                       patient_id: tempPatientsTwo[i].patient_id,
@@ -331,17 +349,18 @@
                       type: tempPatientsTwo[i].new_order_info[b].type,
                       item_name: tempPatientsTwo[i].new_order_info[b].item_name,
                       item_id: tempPatientsTwo[i].new_order_info[b].item_id,
-                      count: tempPatientsTwo[i].new_order_info[b].count
-
+                      count: tempPatientsTwo[i].new_order_info[b].count,
+                      item_spec: tempPatientsTwo[i].new_order_info[b].item_spec
                     }
 
+
                     // if(b == 0){
                     obj['total'] = tempPatientsTwo[i].total
                     // }else{
                     //   obj['total'] = 0
                     // }
                     this.tableData.push(obj)
-                  }
+
 
                 }
               }
@@ -471,7 +490,7 @@
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 5) {
+        if (columnIndex === 0 || columnIndex === 6) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {
@@ -487,9 +506,9 @@
           let name = order.name
           let item_name = order.item_name
           let count = order.count
-          let price = order.price.toFixed(2)
-          let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-          let total = order.total.toFixed(2)
+          let price = order.price.toFixed(4)
+          let pay_sumamt = (order.price.toFixed(4) * order.count).toFixed(4)
+          let total = order.total.toFixed(4)
 
           let obj = {
             '患者姓名': name,
@@ -537,9 +556,9 @@
             // sums[index] = sums[index].toFixed(2)
             let num = 0
             data.map(item => {
-              num += item.price.toFixed(2) * item.count
+              num += item.price.toFixed(4) * item.count
             })
-            sums[index] = num.toFixed(2)
+            sums[index] = num.toFixed(4)
           } else {
             sums[index] = ''
           }

src/xt_pages/outpatientTool/components/gather.vue

@@ -69,11 +69,11 @@
               <template slot-scope="scope">{{scope.row.item_name}}</template>
           </el-table-column>
           <el-table-column align="center" prop="price" label="费用">
-              <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
+              <template slot-scope="scope">{{scope.row.price.toFixed(4)}}</template>
           </el-table-column>
           <el-table-column align="center" prop="sum" label="费用总额">
               <template slot-scope="scope">
-                  <div>{{scope.row.sum.toFixed(2)}}</div>
+                  <div>{{scope.row.sum.toFixed(4)}}</div>
               </template>
           </el-table-column>
 
@@ -466,7 +466,7 @@
                 return prev
               }
             }, 0)
-            sums[index] = sums[index].toFixed(2)
+            sums[index] = sums[index].toFixed(4)
           } else {
             sums[index] = ''
           }
@@ -480,8 +480,8 @@
           let order = this.tableData[i]
           let name = order.name
           let item_name = order.item_name
-          let pay_sumamt = order.price.toFixed(2)
-          let total = order.sum.toFixed(2)
+          let pay_sumamt = order.price.toFixed(4)
+          let total = order.sum.toFixed(4)
 
 
           let obj = {

src/xt_pages/outpatientTool/components/settle.vue

@@ -93,7 +93,7 @@
           </el-table-column>
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">
-                  <div>{{scope.row.total.toFixed(2)}}</div>
+                  <div>{{scope.row.total.toFixed(4)}}</div>
               </template>
           </el-table-column>
 
@@ -194,7 +194,7 @@
               for (let b = 0; b < data[i].orders.length; b++) {
                 let order = data[i].orders[b]
                 order['other_name'] = data[i].name
-                total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
+                total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(4).toString())
               }
 
               data[i]['total'] = total
@@ -312,7 +312,7 @@
                 return prev
               }
             }, 0)
-            sums[index] = sums[index].toFixed(2)
+            sums[index] = sums[index].toFixed(4)
           } else {
             sums[index] = ''
           }

src/xt_pages/stock/drugs/drugPrint.vue

@@ -40,7 +40,7 @@
               <td style="line-height: 50px">
                 <span>{{item.XtBaseDrug.min_unit}}</span>
               </td>
-            
+
               <td style="line-height: 50px">
                   {{getCount(item.drug_id)}}
               </td>
@@ -48,7 +48,7 @@
                   {{item.price}}
               </td>
               <td style="line-height:50px">
-                 {{(getCount(item.drug_id)*item.price).toFixed(2)}}
+                 {{(getCount(item.drug_id)*item.price).toFixed(4)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -65,7 +65,7 @@
               <td style="line-height: 50px" width="50"></td>
               <td style="line-height: 50px" width="80"></td>
               <td style="line-height: 50px" width="80"></td>
-              <td style="line-height: 50px" width="80">{{getTotal().toFixed(2)}}</td>
+              <td style="line-height: 50px" width="80">{{getTotal().toFixed(4)}}</td>
               <td style="line-height: 50px" width="80"></td>
             </tr>
 
@@ -108,7 +108,7 @@
           { path: false, name: '打印单' }
         ],
         loading: false,
-        orgname: '',   
+        orgname: '',
         totalPrice: 0,
         stockDatas: [],
         goodUnit: [],
@@ -151,7 +151,7 @@
           scanStyles: false
         })
       },
-   
+
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
@@ -218,7 +218,7 @@
           var total = response.data.data.total
           this.total = total
         }
-      })  
+      })
       },
 
       getTotal(){
@@ -240,10 +240,10 @@
              var list = response.data.data.list
              console.log("入库单详情",list)
              this.cancelStockDate  = list
-           }   
+           }
         })
 
-        
+
       },
       getCount(drug_id){
         var total = 0
@@ -275,7 +275,7 @@
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       // this.getlist()
-     
+
 
       this.getDrugWarehouseInfoPrint()
        this.getDrugCountList()

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -53,7 +53,7 @@
                                 <tr>
                                   <td>合计</td>
                                   <td colspan="7"></td>
-                                  <td>{{getAllPice(it.id).toFixed(2)}}</td>
+                                  <td>{{getAllPice(it.id).toFixed(4)}}</td>
                                </tr>
                             </tbody>
                         </table>
@@ -222,13 +222,13 @@ export default {
             return false
           } else {
             this.list = [];
-        
+
             for (let i = 0; i < response.data.data.list.length; i++) {
 
-              
+
               this.list.push(response.data.data.list[i])
             }
-          
+
           }
         })
       },
@@ -256,7 +256,7 @@ export default {
          for(let i=0;i<this.orderList.length;i++){
           if(this.orderList[i].warehouse_out_id == warehouse_out_id && this.orderList[i].good_id == good_id){
              count += this.orderList[i].count
-          } 
+          }
          }
          return count
       },
@@ -308,7 +308,7 @@ export default {
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
-     
+
       GetOrderDetailOne(id){
         const params = {
           'id': id
@@ -334,7 +334,7 @@ export default {
         })
      },
      getAllPice(id){
-        var  total_price = 0 
+        var  total_price = 0
         for(let i=0;i<this.orderList.length;i++){
           if(id == this.orderList[i].warehouse_out_id){
              total_price += this.orderList[i].count * this.orderList[i].price