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

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -1324,17 +1324,19 @@ export default {
                     }).catch(() => {
                     })
                   } else {
-                    if(response.data.data.order_way == 2){
-                      that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
-                      var message = ""
-                      var order = response.data.data.order
+                    if(response.data.data.order_way != 1){
+                      let message = ""
+                      console.log(message)
+                      let order = response.data.data.order
+                      console.log(order)
                       message = "总费用:" + order.medfee_sumamt+"元" + "\n"
                           + "基金支付总额:"+ order.fund_pay_sumamt+"元" + "\n"
                           +  "基本医疗保险统筹基金支出:"+ order.hifp_pay+"元" + "\n"
                           + "医疗救助基金支出:" + order.maf_pay + "元"+ "\n"
-                          + "个人账户支付金额" + order.acct_pay + "元" + "\n"
+                          + "个人账户支付金额:" + order.acct_pay + "元" + "\n"
                           +"个人支付金额:" + order.psn_cash_pay + "元" +"\n"
                           + "个人账户金额:" +  order.balc + "元"
+                      console.log(message)
 
                       that.$confirm(message, '预结算信息', {
                         confirmButtonText: '确 定',
@@ -1346,9 +1348,7 @@ export default {
                     }else{
                       that.changeRadioAndPatient(1)
                       that.$message({ message: '预结算成功', type: 'success', duration: 5000 })
-
                     }
-
                   }
                 }
               })

src/xt_pages/supply/supplyQuery.vue

@@ -31,7 +31,7 @@
 
           <el-input
             size="small"
-            style="width: 200px; margin-left: 10px"
+            style="width: 270px; margin-left: 10px"
             class="filter-item"
             v-model.trim="keywords"
             placeholder="按供应商编号，供应商名称，联系人搜索"