柏霖

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -80,13 +80,28 @@
 
       <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 0">
 
-        <el-checkbox-group v-model="form.pay_ways">
+        <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.cash_pay" ></el-input>
+      </el-form-item>
 
-      <el-form-item label="其他说明：">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.ali_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
+        <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
+      </el-form-item>
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 0  ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 
@@ -171,7 +186,7 @@
           medical_insurance_price:0,
           private_price:'',//自费12
           pay_way:"",
-          pay_ways:[],
+          pay_wayss:[],
           dec_way:'false',//是否使用押金支付
           tmp_decimal:"",//本次使用的押金
           pay_price:'',
@@ -191,6 +206,11 @@
           acct_mulaid_pay:'',
           fulamt_ownpay_amt:'',
           acct_used_flag:0,
+          cash_pay:"",
+          band_card_pay:"",
+          wechat_pay:"",
+          ali_pay:"",
+          jifen_pay:"",
         },
         payWays: [
           {value: "1", label: '现金'},
@@ -200,8 +220,6 @@
           {value: "7", label: '积分'},
           {value: "4", label: '医保卡'},
           {value: "8", label: '其他'},
-
-
         ],
         total:"",
 
@@ -226,6 +244,13 @@
           overlmt_self_pay:"",
           acct_mulaid_pay:"",
           fulamt_ownpay_amt:"",
+          pay_wayss: [],
+          acct_used_flag:0,
+          cash_pay:"",
+          band_card_pay:"",
+          wechat_pay:"",
+          ali_pay:"",
+          jifen_pay:"",
         },
 
       }
@@ -333,11 +358,7 @@
         this.form.total = total + this.form.medical_insurance_price
         this.form.discount_price = 0.0
         this.form.preferential_price = 0.0
-        this.form.pay_ways = []
         this.form.acct_used_flag = 0
-
-
-
         this.form.fapiao_code =""
         this.form.fapiao_number = ""
         this.order = order
@@ -379,6 +400,7 @@
             value = this.getValue()
             console.log(value)
             this.$emit('confirm', value)
+
             this.loadingtwo = true
           }
         })

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1506,7 +1506,7 @@ export default {
     },
     chargeConfirm(form) {
       this.newLoading = true
-      form.pay_ways = form.pay_ways.join(",")
+      form['pay_ways'] = form.pay_wayss.join(",")
       form['id'] = this.patientInfo.id
       form['his_patient_id'] = this.hisPatientInfo.id
       form['record_time'] = this.record_date

src/xt_pages/outpatientTool/components/settle.vue

@@ -129,7 +129,29 @@
               <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="微信支付">
+          <template slot-scope="scope">{{scope.row.wechat_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="支付宝支付">
+          <template slot-scope="scope">{{scope.row.ali_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="银行卡支付">
+          <template slot-scope="scope">{{scope.row.band_card_pay}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="积分支付">
+          <template slot-scope="scope">{{scope.row.jifen_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="现金支付">
+          <template slot-scope="scope">{{scope.row.cash_pay}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="item_name" label="其他说明">
+          <template slot-scope="scope">{{scope.row.oth_desc}}</template>
+        </el-table-column>
 
           <el-table-column align="center" prop="total" label="费用总额">
               <template slot-scope="scope">