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/statementTemplate/printFour.vue

@@ -72,7 +72,7 @@
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">记账支付</p>
-                                <p style="width:50%;">{{info.fund_pay_sumamt?info.fund_pay_sumamt:0}}元</p>
+                                <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
                             </div>
                             <div class="chargeUl" style="border-top:1px solid #000;">
                                 <p style="width:50%;">个人账号</p>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -87,7 +87,7 @@
                       <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.fund_pay_sumamt?info.fund_pay_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>

src/xt_pages/user/templateSummary.vue

@@ -1835,4 +1835,7 @@
 .el-table::before {
   background-color: #d0d3da;
 }
+.el-select-dropdown {
+  max-width: 1000px !important;
+}
 </style>