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

src/xt_pages/outpatientCharges/allListPrint.vue

             return false
           } else {
             this.order = response.data.data.order
+            this.order['bedCostTotal'] = response.data.data.bedCostTotal
+            this.order['operationCostTotal'] = response.data.data.operationCostTotal
+            this.order['otherCostTotal'] = response.data.data.otherCostTotal
+            this.order['materialCostTotal'] = response.data.data.materialCostTotal
+            this.order['westernMedicineCostTotal'] = response.data.data.westernMedicineCostTotal
+            this.order['chineseTraditionalMedicineCostTotal'] = response.data.data.chineseTraditionalMedicineCostTotal
+            this.order['checkCostTotal'] = response.data.data.checkCostTotal
+            this.order['zhenChaCostTotal'] = response.data.data.zhenChaCostTotal
+            this.order['laboratoryCostTotal'] = response.data.data.laboratoryCostTotal
+            this.order['treatCostTotal'] = response.data.data.treatCostTotal
+
+
             this.patient = response.data.data.patient
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
 
-            //获取所有项目类型进行去重
-            let med_chrgitm_types = []
-            for (let i = 0; i < order_info.length; i++) {
-              med_chrgitm_types.push(order_info[i].med_chrgitm_type)
-            }
-            const obj = {}
-            med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
-              obj[next] ? '' : obj[next] = true && cur.push(next)
-              return cur
-            }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
-            let tempOrderInfo = []
-
-            for (let i = 0; i < med_chrgitm_types.length; i++) {
-              let obj = {
-                total: 0,
-                details: []
+            if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
               }
-              let tempDetails = []
-              for (let b = 0; b < order_info.length; b++) {
-                if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
-                  tempDetails.push(order_info[b])
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              let tempOrderInfo = []
+
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: []
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
                 }
-              }
 
-              obj.details = this.setNewData(tempDetails)
-              // obj.total = this.getTotal(obj.details)
+                obj.details = this.setNewData(tempDetails)
+                // obj.total = this.getTotal(obj.details)
+                //
+                // obj.details.push({
+                //   total: obj.total,
+                //   is_total: 1,
+                // })
+                this.list =  this.list.concat(obj.details)
+              }
 
-              // obj.details.push({
-              //   total: obj.total,
-              //   is_total: 1,
-              // })
-              this.list =  this.list.concat(obj.details)
-            }
 
+            }else{
 
+              //获取所有项目类型进行去重
+              let med_chrgitm_types = []
+              for (let i = 0; i < order_info.length; i++) {
+                med_chrgitm_types.push(order_info[i].med_chrgitm_type)
+              }
+              const obj = {}
+              med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
+                obj[next] ? '' : obj[next] = true && cur.push(next)
+                return cur
+              }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+              let tempOrderInfo = []
+
+              for (let i = 0; i < med_chrgitm_types.length; i++) {
+                let obj = {
+                  total: 0,
+                  details: []
+                }
+                let tempDetails = []
+                for (let b = 0; b < order_info.length; b++) {
+                  if (med_chrgitm_types[i] == order_info[b].med_chrgitm_type) {
+                    tempDetails.push(order_info[b])
+                  }
+                }
 
+                obj.details = this.setNewData(tempDetails)
+                obj.total = this.getTotal(obj.details)
 
+                obj.details.push({
+                  total: obj.total,
+                  is_total: 1,
+                })
+                this.list =  this.list.concat(obj.details)
+              }
+            }
           }
         })
       }, getTotal:function(items){
               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name
                 obj['spec'] = details[a].advice.drug.drug_spec
-                obj['unit'] = details[a].advice.drug.max_unit
-
+                obj['unit'] = details[a].advice.drug.min_unit
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                if( details[a].project.type == 2){
                  obj['name'] = details[a].project.project.project_name
+                 obj['spec'] = '次'
+                 obj['unit'] = details[a].project.project.unit
+
+
                }else if(details[a].project.type == 3){
                  obj['name'] = details[a].project.good_info.good_name
-               }
-                obj['unit'] = details[a].project.unit
+                 obj['spec'] = details[a].project.good_info.specification_name
+                 obj['unit'] = this.getGoodUnit( details[a].project.good_info.good_unit)
 
-                obj['spec'] = '1'
+               }
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
 
         return list
 
-      }, unique(array) {
+      }, getGoodUnit(id) {
+        var goodUnit = this.$store.getters.good_unit
+        for (let i = 0; i < goodUnit.length; i++) {
+          if (goodUnit[i].id == id) {
+            return goodUnit[i].name
+          }
+        }
+      },unique(array) {
         // res用来存储结果
         var res = []
         for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
           }
         }
         return res
-      },
-
-      getType(med_chrgitm_type) {
+      },getType(med_chrgitm_type){
         switch (med_chrgitm_type) {
           case '01':
             return '床位费'
 
         }
 
+
+      },
+
+      getMedicineInsuranceType(type) {
+        switch (type) {
+          case "01":
+            return '甲类'
+            break
+          case "02":
+            return '乙类'
+
+            break
+          case "03":
+            return '自费'
+            break
+
+        }
+
       },
       printThisPage() {
 

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

     </div>
 
     <div class="allListInfo">
-      <div>西药</div>
-      <div >中成药</div>
-      <div >中草药</div>
-      <div >检查费</div>
+      <div>西药:{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
+      <div >中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
+      <div >中草药:</div>
+      <div >检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
     </div>
 
 
     <div class="allListInfo">
-      <div >输氧费</div>
-      <div>手术费</div>
-      <div >化验费</div>
-      <div>输血费</div>
+      <div >输氧费:</div>
+      <div>手术费:{{order.operationCostTotal?order.operationCostTotal:''}}</div>
+      <div >化验费:{{order.laboratoryCostTotal?order.laboratoryCostTotal:''}}</div>
+      <div>输血费:</div>
     </div>
 
 
     <div class="allListInfo">
-      <div >诊察费</div>
-      <div >治疗费</div>
-      <div >护理费</div>
-      <div >床位费</div>
+      <div >诊察费:{{order.zhenChaCostTotal?order.zhenChaCostTotal:''}}</div>
+      <div >治疗费:{{order.treatCostTotal?order.treatCostTotal:''}}</div>
+      <div >护理费:</div>
+      <div >床位费:{{order.bedCostTotal?order.bedCostTotal:''}}</div>
     </div>
 
 
     <div class="allListInfo">
-      <div >麻醉费</div>
-      <div >材料费</div>
-      <div >其他费</div>
+      <div >麻醉费:</div>
+      <div >材料费:{{order.materialCostTotal?order.materialCostTotal:''}}</div>
+      <div >其他费:{{order.otherCostTotal?order.otherCostTotal:''}}</div>
     </div>
     <!--    <div style="display:flex;justify-content: space-between;">-->
 <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
         <td style="width:5%">单位</td>
         <td style="width:10%">数量</td>
         <td style="width:10%">单价</td>
-        <td style="width:15%">金额</td>
+        <td style="width:10%">金额</td>
         <td style="width:10%">医保类型</td>
 
       </tr>
           <td style="width:5%">{{ item.unit }}</td>
           <td style="width:10%">{{ item.count }}</td>
           <td style="width:10%">{{ item.price }}</td>
-          <td style="width:15%">{{ (item.price * item.count).toFixed(2) }}</td>
+          <td style="width:10%">{{ (item.price * item.count).toFixed(2) }}</td>
           <td style="width:10%">{{ item.medicine_insurance_kind }}</td>
 
         </tr>

src/xt_pages/outpatientCharges/listPrint.vue

   import printOne from './listTemplate/printOne'
   import printTwo from './listTemplate/printTwo'
   // import printThree from './listTemplate/printThree'
+  import print from "print-js";
 
   import { getHisOrderDetail,getPrivateExpensesOrder } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                 obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                 obj['name'] = infos.advice.advice_name
-                obj['unit'] = infos.advice.drug.max_unit
+                obj['unit'] = infos.advice.drug.min_unit
                 obj['feedetl_sn'] =  infos.feedetl_sn
 
 
       },
       printThisPage() {
         if(this.org_id != 10106){
-          const style =
-          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
-          printJS({
-            printable: 'list-print',
-            type: 'html',
-            style: style,
-            scanStyles: false
-          })
+          if(this.org_id == 10215 || this.org_id == 0){
+            const style =
+                '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+            printJS({
+              printable: 'allList-print',
+              type: 'html',
+              style: style,
+              scanStyles: false
+            })
+
+
+          }else {
+            const style =
+                '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
+            printJS({
+              printable: 'list-print',
+              type: 'html',
+              style: style,
+              scanStyles: false
+            })
+          }
         }else{
           const style =
           '@media print {#statement-print{font-size:12px;width:800px;margin:0 auto;}.statementTitle{font-size: 22px;text-align: center;margin-bottom: 10px;}.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;}}';