From dd59ca83a81fff33427e83f978640a479dcf5d47 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 8 Sep 2023 13:48:22 +0800
Subject: [PATCH] edit

---
 .../patientRegister/PatientRegisterEdit.vue   | 11 +++++-----
 src/views/fee-settings/cardRegister.vue       | 21 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 31c9cb2..3b37fdc 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -54,12 +54,9 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="出生日期" prop="birthDate">
-                  <!--
                   <el-date-picker v-model="form.birthDate" type="date" value-format="yyyy-MM-dd" placeholder="出生日期"
                     :style="'width:' + Math.floor((window.pageWidth - 530) / 4.8) + 'px;'" @change="changeBirthDate"
-                    prefix-icon="" />
-                  -->
-                  <el-input type="date" v-model="form.birthDate" @blur="changeBirthDate" />
+                    prefix-icon="" />                 
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -438,7 +435,7 @@
       </span>
     </el-dialog>
     <!-- 拍照 -->
-    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600" :show-close="false"
+    <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600" 
       :close-on-click-modal="false" :append-to-body="true">
       <Camera :id="form.id" />
     </el-dialog>
@@ -1041,6 +1038,10 @@ export default {
   padding-right: 15px;
 }
 
+::v-deep .el-icon-date:before {
+    content: ""
+}
+
 .btn {
   margin-top: 5px;
 }
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index e4172bc..f8b139f 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -56,13 +56,14 @@
           <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 100 : window.pageHeight - 500"
             row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
             @row-click="rowClick">
-            <el-table-column prop="cardTypeId" label="卡类别" width="100">
+            <el-table-column prop="cardTypeId" label="卡类别" width="70">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.cardType, "id", scope.row.cardTypeId, "displayName") }}</div>
               </template>
             </el-table-column>
             <el-table-column prop="cardNo" label="会员卡号" width="150" />
             <el-table-column prop="discount" label="折扣率" width="80" />
+            <el-table-column prop="cardBalance" label="卡余额" width="80" />            
             <el-table-column prop="expiryDate" label="有效期限" width="120">
               <template slot-scope="scope">
                 <div v-if="scope.row.expiryDate">
@@ -265,8 +266,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="充值金额" prop="billMoney">
-            <el-input type="number" v-model="order.billMoney" :disabled="order.id ? true:false" style="width:200px;"/>
+          <el-form-item label="充值金额" prop="rechargeAmount">
+            <el-input type="number" v-model="order.rechargeAmount" :disabled="order.id ? true:false" style="width:200px;"/>
           </el-form-item>
         </el-col>        
       </el-form>
@@ -330,7 +331,7 @@ export default {
         cardRegisterId:null,
         cardNo:'', //仅显示用
         payModeId:'',
-        billMoney:0,
+        rechargeAmount:0,
         billFlag:'2',
       },
 
@@ -371,7 +372,7 @@ export default {
         payModeId: [
           { required: true, message: "请填写充值方式", trigger: "blur" },
         ],
-        billMoney: [
+        rechargeAmount: [
           { required: true, message: "请填写充值金额", trigger: "blur" },
         ],
       },
@@ -517,12 +518,14 @@ export default {
           return;
         }
         
-        body = deepCopy(this.form);
+        body = deepCopy(this.order);
         delete body.id;
         delete body.cardNo;
-       
-        //充值
-        postapi('/api/app/cardregister/create',body).then(res =>{
+        //delete body.billFlag;
+
+    
+        //充值  /api/app/cardregister/cardregisterrecharge
+        postapi('/api/app/cardregister/cardregisterrecharge',body).then(res =>{
           if(res.code != - 1){
             this.$message.success("操作成功！");
             this.getCardBill(this.curChoosedId);