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

               for (let i = 0; i < med_chrgitm_types.length; i++) {
                 let obj = {
                   total: 0,
-                  details: []
+                  details: [],
+                  is_total:0,
                 }
                 let tempDetails = []
                 for (let b = 0; b < order_info.length; 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)
               }
 
+              let newobj = {}
+              newobj['total'] = this.order.medfee_sumamt
+              newobj['is_total'] = 1
+              this.list.push(newobj)
 
             }else{
 
             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) {
                 obj['name'] = details[a].advice.advice_name
-                obj['spec'] = details[a].advice.drug.drug_spec
+                // 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.min_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
               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['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'] = details[a].project.good_info.specification_name
-                 obj['unit'] = this.getGoodUnit( details[a].project.good_info.good_unit)
+                 obj['spec'] = ''
+                 obj['unit'] = details[a].project.good_info.packing_unit
 
                }
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

 }
 
 .allListTitle {
-  font-size: 24px;
+  font-size: 22px;
   text-align: center;
   font-weight: bold;
   margin-bottom: 10px;
 
 .allListInfo {
   display: flex;
-  font-size: 16px;
+  font-size: 14px;
   justify-content: space-between;
   margin: 10px 0;
 }
   text-align: center;
   border-collapse: collapse;
   line-height: 20px;
-  font-size: 14px;
+  font-size: 12px;
   border-color: #000;
   text-align: left;
 }
 }
 
 .tableBottom {
-  font-size: 16px;
+  font-size: 14px;
   display: flex;
   margin-top: 20px;
 }

src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue

 
     <div class="allListInfo">
       <div>西药:&nbsp;&nbsp;&nbsp;{{order.westernMedicineCostTotal?order.westernMedicineCostTotal:''}}</div>
-      <div >中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
-      <div >中草药:</div>
-      <div >检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
+      <div>中成药:{{order.chineseTraditionalMedicineCostTotal?order.chineseTraditionalMedicineCostTotal:''}}</div>
+      <div>中草药:</div>
+      <div>检查费:{{order.checkCostTotal?order.checkCostTotal:''}}</div>
     </div>
 
 
     <div class="allListInfo">
-      <div >输氧费:</div>
+      <div>输氧费:</div>
       <div>手术费:{{order.operationCostTotal?order.operationCostTotal:''}}</div>
-      <div >化验费:{{order.laboratoryCostTotal?order.laboratoryCostTotal:''}}</div>
+      <div>化验费:{{order.laboratoryCostTotal?order.laboratoryCostTotal:''}}</div>
       <div>输血费:</div>
     </div>
 
       <tr>
         <td style="width:10%">费用类别</td>
         <td style="width:35%">项目名称</td>
-        <td style="width:15%">规格</td>
         <td style="width:5%">单位</td>
         <td style="width:10%">数量</td>
         <td style="width:10%">单价</td>
 
       </tr>
       <template v-for='(item,index) in list'>
-        <tr>
+        <tr v-if="item.is_total == 2">
           <td style="width:10%">{{ item.med_chrgitm_type }}</td>
-          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.name }}</td>
-          <td style="width:15%">{{ item.spec }}</td>
+          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{ item.name }}{{ item.spec }}</td>
           <td style="width:5%">{{ item.unit }}</td>
-          <td style="width:10%">{{ item.count }}</td>
-          <td style="width:10%;text-align:right;">{{ item.price }}</td>
+          <td style="width:10%;text-align:right;">{{ item.count }}</td>
+          <td style="width:10%;text-align:right;">{{ item.price.toFixed(4) }}</td>
           <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
           <td style="width:10%">{{ item.medicine_insurance_kind }}</td>
 
         </tr>
+        <tr v-if="item.is_total == 1">
+          <td style="width:10%"></td>
+          <td style="width:35%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">合计</td>
+          <td style="width:5%"></td>
+          <td style="width:10%;text-align:right;"></td>
+          <td style="width:10%;text-align:right;"></td>
+          <td style="width:10%;text-align:right;">{{ item.total }}</td>
+          <td style="width:10%"></td>
+
+        </tr>
       </template>
     </table>
 

src/xt_pages/outpatientCharges/listPrint.vue

               var infos = response.data.data.order_info[i]
               let obj = {
                 med_chrgitm_type: this.getType(infos.med_chrgitm_type),
-                price: infos.pric,
+                price: infos.pric.toFixed(4),
                 count: infos.cnt
               }
               console.log(infos)
                   obj['name'] = infos.project.project.project_name
                   obj['spec'] = ''
                   obj['unit'] =  infos.project.project.unit
+                  obj['is_total']= 0
 
 
                 }else if (infos.project.type == 3){
                   obj['name'] = infos.project.good_info.good_name
-                  obj['spec'] = infos.project.good_info.specification_name
-                  obj['unit'] = this.getGoodUnit(infos.project.good_info.good_unit)
+                  obj['spec'] = ""
+                  obj['unit'] = infos.project.good_info.packing_unit
+                  obj['is_total']= 0
 
                 }
 
 
               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['name'] = infos.advice.drug.drug_name
                 obj['unit'] = infos.advice.drug.min_unit
                 obj['feedetl_sn'] =  infos.feedetl_sn
+                obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
+                obj['is_total']= 0
+
+                // v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
 
 
               }
                 return b.p_time < a.p_time ? 1 : -1
               })
 
+
             }
+
+
+            let newObj = {}
+            newObj['name'] = "合计"
+            newObj['price']= this.order.medfee_sumamt
+            newObj['is_total']= 1
+            this.list.push(newObj)
           }
         })
       },

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

   <div id="allList-print" class="allList-print">
       <div class="allListTitle">{{ $store.getters.xt_user.org.org_name }}费用清单</div>
       <div class="allListInfo">
-        <div>患者姓名：{{ patient.name }}</div>
-        <div>性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
-        <div>结算类型：{{order.is_medicine_insurance == 1 ?'医保':'自费'}}</div>
-        <div>发票号码：</div>
+        <div style="text-align:left;">患者姓名：{{ patient.name }}</div>
+        <div style="text-align:left;padding-left: -20px">性别：{{ patient.gender == 1 ? '男' : '女' }}</div>
+        <div style="text-align:left;">结算类型：{{order.is_medicine_insurance == 1 ?'医保':'自费'}}</div>
+<!--        <div>发票号码：</div>-->
       </div>
 
     <div class="allListInfo">
-        <div>住院/门诊号：{{order.mdtrt_id}}</div>
-        <div>科室：血透</div>
-        <div>就诊流水号：{{order.mdtrt_id}}</div>
-        <div>总费用：{{order.medfee_sumamt}}</div>
+        <div style="text-align:left;">住院/门诊号：{{order.mdtrt_id}}</div>
+        <div style="text-align:left;">科室：血透</div>
+        <div style="text-align:left;">就诊流水号：{{order.mdtrt_id}}</div>
     </div>
 
       <div class="allListInfo">
-
-      <div>个人支付：{{order.psn_part_amt}}</div>
-        <div>基金支付记账：{{order.fund_pay_sumamt}}</div>
-        <div>补充医疗支付记账：0.00</div>
-        <div>救助支付金额：{{order.maf_pay}}</div>
+        <div style="text-align:left;">总费用：{{order.medfee_sumamt}}</div>
+        <div style="text-align:left;">个人支付：{{order.psn_part_amt}}</div>
+        <div style="text-align:left;">基金支付记账：{{order.fund_pay_sumamt}}</div>
+        <div style="text-align:left;">补充医疗支付记账：0.00</div>
+        <div style="text-align:left;">救助支付金额：{{order.maf_pay}}</div>
       </div>
       <table class="allListTable" border="1">
         <tr>
           <td style="width:5%">序号</td>
           <td style="width:15%">处方日期</td>
           <td style="width:10%">费用编号</td>
-          <td style="width:30%">费用名称</td>
-          <td style="width:10%">规格</td>
+          <td style="width:40%">费用名称</td>
           <td style="width:5%">单位</td>
           <td style="width:5%">数量</td>
           <td style="width:10%">单价</td>
           <td style="width:10%">金额</td>
         </tr>
         <template v-for='(item,index) in list'>
-          <tr>
+          <tr v-if="item.is_total == 0">
             <td style="width:5%">{{index + 1}}</td>
             <td style="width:15%">{{item.p_time}}</td>
             <td style="width:10%">{{item.feedetl_sn.split("-")[2]}}</td>
-            <td style="width:40%;white-space: nowrap;overflow: hidden;">{{item.name}}/{{item.spec}}</td>
+            <td style="width:30%;white-space: nowrap;overflow: hidden;">{{item.name}}{{item.spec}}</td>
             <td style="width:5%">{{item.unit}}</td>
-            <td style="width:5%">{{ item.count }}</td>
+            <td style="width:5%;text-align:right;">{{ item.count }}</td>
             <td style="width:10%;text-align:right;">{{ item.price }}</td>
             <td style="width:10%;text-align:right;">{{ (item.price * item.count).toFixed(2) }}</td>
           </tr>
+          <tr v-if="item.is_total == 1">
+            <td style="width:5%"></td>
+            <td style="width:15%"></td>
+            <td style="width:10%"></td>
+            <td style="width:30%;white-space: nowrap;overflow: hidden;">{{item.name}}</td>
+            <td style="width:5%"></td>
+            <td style="width:5%"></td>
+            <td style="width:10%;text-align:right;"></td>
+            <td style="width:10%;text-align:right;">{{ item.price}}</td>
+          </tr>
         </template>
       </table>
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
 
           <div>
-            <el-button size="small"
-                       @click="openZb(1)"
-                       type="primary">登记
-            </el-button>
-
-            <el-button  size="small"
-                       @click="openZb(2)"
-                       type="primary">记账
-            </el-button>
-
-            <el-button   size="small"
-                       @click="openZb(3)"
-                       type="primary">撤销记账
-            </el-button>
+<!--            <el-button size="small"-->
+<!--                       @click="openZb(1)"-->
+<!--                       type="primary">登记-->
+<!--            </el-button>-->
+
+<!--            <el-button  size="small"-->
+<!--                       @click="openZb(2)"-->
+<!--                       type="primary">记账-->
+<!--            </el-button>-->
+
+<!--            <el-button   size="small"-->
+<!--                       @click="openZb(3)"-->
+<!--                       type="primary">撤销记账-->
+<!--            </el-button>-->
 
 
             <el-button v-loading="loadingone" size="small"