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

src/xt_pages/dialysis/dialysisPrintOrder.vue

         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style2 =
       // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
-        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;}.check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
+        '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}';
       const style3 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

 
           // this.advices = response.data.data.advices
 
-           var advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
-           
+          //  var advices =  response.data.data.advices.concat(response.data.data.doctorAdvice)
+          var advices =  response.data.data.advices
           var newAdvices = this.unique(advices)
-           console.log("newAdvices",newAdvices)
-
+         
           this.advices = newAdvices
           this.tableAdvice = newAdvices
-
-          console.log("去重后",this.advices)
+          // console.log("去重后",this.advices)
+          
+          this.advices = this.advices.filter(o => o.advice_type != 1)
+        
           this.monitors = response.data.data.monitors
           this.summary = response.data.data.summary
           this.org_template_info = response.data.data.org_template_info

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

           </div>
         </div>
 
-        <div class="row" :style="this.totollength > 13 ? 'margin-bottom:400px;' : ''">
+        <div class="row" :style="this.totollength >= 13 ? 'margin-bottom:70px;' : ''">
           <table class="proj_table">
             <tbody>
               <tr>
             </tbody>
           </table>
         </div>
-        <template v-if="this.totollength > 13">
+        <template v-if="this.totollength >= 13">
           <div style="display:inline-block;width:100%;text-align:center;">
             <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">
               {{ orgname }}

src/xt_pages/hospitalStation/invoicePrint.vue

           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215 ||  org_id == 0" :paramsObj="invoiceParams"></printTwo>
+        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

             <!-- <div  style="position: absolute;left:560px;top:70px;">
 
             </div> -->
-          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '390'">
+          <div  style="position: absolute;left:400px;top:70px;" v-if="insutype == '390'">
             类别：城乡居民基本医疗保险
           </div>
-          <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '310'">
+          <div  style="position: absolute;left:400px;top:70px;" v-else-if ="insutype == '310'">
             类别：职工基本医疗保险
           </div>
         </div>
         </div> -->
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-            预交款合计:0.00
+            预交款合计:{{pre_pay_money}}
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
           out_hosptial_time:'',
           number:'',
           insutype:'',
+          pre_pay_money:"",
         }
     },
     mounted(){
               this.id_card_no = this.list.his_hospital_record.id_card_no
               this.number = this.list.his_hospital_record.number
               this.psn_no = this.list.his_hospital_record.psn_no
-
+              this.pre_pay_money = this.list.pre_pay_money
 
               this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
               this.gend= this.list.his_hospital_record.gend

src/xt_pages/hospitalStation/summary.vue

         statementVisible9504: false,
         orderObj9504: {},
         crumbs: [
-          { path: false, name: '门诊收费' },
+          { path: false, name: '住院收费' },
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],

src/xt_pages/outpatientCharges/listPrint.vue

                 obj.bingTotal = this.getBingTotal(tempDetails)
                 obj.otherTotal = this.getOtherTotal(tempDetails)
 
-                obj.details = this.setNewData(tempDetails)
+                obj.details = this.set10265NewData(tempDetails)
                 this.list.push(obj)
               }
               console.log(this.list)
           total = Number(total) + Number(parseFloat(items[i].cnt) * parseFloat(items[i].pric))
         }
         return total.toFixed(2)
-      },setNewData(details) {
+      },
+      setNewData(details) {
         let drug_ids = []
         let project_ids = []
 
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
             let obj = {
               id: details[i].advice.drug_id,
-              price: details[i].advice.price
+              price: details[i].advice.price,
+              lv: details[i].chrgitm_lv,
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
             let obj = {
               id: details[i].project.project_id,
-              price: details[i].project.price
+              price: details[i].project.price,
+              lv: details[i].chrgitm_lv,
 
             }
             project_ids.push(obj)
         let new_project_ids = this.unique(project_ids)
         let list = []
 
-        // console.log('ids')
-        // console.log(new_drug_ids)
-        // console.log(new_project_ids)
-        // console.log('ids')
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
 
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
             let count = 0
             for (let a = 0; a < details.length; a++) {
-              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+              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['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
         return list
 
       },
+      set10265NewData(details) {
+        let drug_ids = []
+        let project_ids = []
+
+        for (let i = 0; i < details.length; i++) {
+          if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            let obj = {
+              id: details[i].advice.drug_id,
+              price: details[i].advice.price,
+              lv: details[i].chrgitm_lv,
+            }
+            drug_ids.push(obj)
+          } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
+            let obj = {
+              id: details[i].project.project_id,
+              price: details[i].project.price,
+              lv: details[i].chrgitm_lv,
+
+            }
+            project_ids.push(obj)
+
+          }
+
+        }
+        //
+        // console.log('old ids')
+        // console.log(drug_ids)
+        // console.log(project_ids)
+        // console.log('old ids')
+
+        let new_drug_ids = this.unique10265(drug_ids)
+        let new_project_ids = this.unique10265(project_ids)
+        let list = []
+
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
+
+        if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
+          for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price && new_drug_ids[i].lv == details[a].chrgitm_lv) {
+                obj['name'] = details[a].advice.advice_name
+                // obj['spec'] = details[a].advice.drug.drug_spec
+                obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.drug.max_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
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price && new_project_ids[i].lv == details[a].chrgitm_lv) {
+                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['spec'] = ''
+                  obj['unit'] = details[a].project.good_info.packing_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
+
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        return list
+
+      },
+
       getType(med_chrgitm_type) {
         switch (med_chrgitm_type) {
           case '01':
 
             break
           case "03":
-            return '自费'
+            return '丙类'
             break
 
         }
-      }, unique(array) {
+      },
+      unique(array) {
         // res用来存储结果
         var res = []
         for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
         }
         return res
       },
+      unique10265(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price && array[i].lv === res[j].lv) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
+
       printThisPage() {
         if(this.org_id != 10106){
           if(this.org_id == 10215){