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

src/xt_pages/supply/components/addSupply.vue

@@ -287,7 +287,7 @@ export default {
       supplier: {
         supplierName: "",
         supplierCode: "gsy001",
-        supplierType: "请选择类别",
+        supplierType: "",
         vatRate: 0,
         number: "",
         bank: "",
@@ -565,22 +565,25 @@ export default {
       let params = {
         id: data.id,
       };
-
-      if (this.show_type == 1) {
-        if (this.recordInfo.contacts.length <= 1) {
-          return;
-        } else {
-          this.recordInfo.contacts.splice(index, 1);
-        }
-      } else if (this.show_type == 2) {
-        delcontactone(params).then((res) => {
-          if (res.data.state == 1) {
-            this.$message.success("删除成功");
-            this.getcontacts(this.supplier_ids);
+      if (params.id==undefined||params.id=="undefined") {
+        this.recordInfo.contacts.splice(index, 1);
+      }else {
+        if (this.show_type == 1) {
+          if (this.recordInfo.contacts.length <= 1) {
+            return;
           } else {
-            this.$message.error(res.data.data.list);
+            this.recordInfo.contacts.splice(index, 1);
           }
-        });
+        } else if (this.show_type == 2) {
+          delcontactone(params).then((res) => {
+            if (res.data.state == 1) {
+              this.$message.success("删除成功!!:",index);
+              this.getcontacts(this.supplier_ids);
+            } else {
+              this.$message.error(res.data.data.list);
+            }
+          });
+        }
       }
     },