From df65c491dfba30dd1cfb2c6f03b961f6aba32385 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 7 Sep 2023 14:34:31 +0800
Subject: [PATCH 1/3] card

---
 src/views/fee-settings/cardRegister.vue | 30 ++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 1797732..5447749 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -396,11 +396,39 @@ export default {
           this.$message.error(fields[Object.keys(fields)[0]][0].message);
           return;
         }
+        // {
+        //   "organizationUnitId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        //   "cardTypeId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        //   "cardNo": "string",
+        //   "cardPassword": "string",
+        //   "discount": 0,
+        //   "expiryDate": "string",
+        //   "customerName": "string",
+        //   "idNo": "string",
+        //   "telephone": "string",
+        //   "mobileTelephone": "string",
+        //   "cardFlag": "string",
+        //   "remark": "string"
+        // }
+
         //编辑
         if (this.form.id) {
-
+          postapi(`/api/app/cardregister/update?id=${this.form.id}`,body).then(res =>{
+            if(res.code != -1){
+              this.$message.success("操作成功！");
+              lfind = arrayExistObj(this.dataList,'id',this.form.id);
+              if(lfind > -1) objCopy(this.form,this.dataList[lfind]); 
+            }
+          });
         } else {
           //新增
+          postapi('/api/app/cardregister/create',body).then(res =>{
+            if(res.code != - 1){
+              this.$message.success("操作成功！");
+              objCopy(res.data,this.form);
+              this.dataList.push(deepCopy(this.form));
+            }
+          });
         }
       });
     },

From de2fb1b4f32f0c1fa0ce1df7b6c009e070a7b775 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 7 Sep 2023 14:37:37 +0800
Subject: [PATCH 2/3] login

---
 src/views/login/Login.vue | 53 ++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index 64a8bb4..7cf401a 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -4,30 +4,14 @@
       <div class="mainbody">
         <div class="title">系统登录</div>
         <div class="userform">
-          <el-form
-            :model="form"
-            :rules="rules"
-            ref="form"
-            class="demo-ruleForm"
-          >
+          <el-form :model="form" :rules="rules" ref="form" class="demo-ruleForm">
             <el-form-item label="" prop="Username">
-              <el-input
-                v-model="form.Username"
-                placeholder="用户名"
-                prefix-icon="el-icon-s-custom"
-              ></el-input>
+              <el-input v-model="form.Username" placeholder="用户名" prefix-icon="el-icon-s-custom"></el-input>
             </el-form-item>
             <el-form-item label="" prop="Password">
-              <el-input
-                v-model="form.Password"
-                placeholder="密码"
-                type="password"
-                prefix-icon="el-icon-unlock"
-              ></el-input>
+              <el-input v-model="form.Password" placeholder="密码" type="password" prefix-icon="el-icon-unlock"></el-input>
             </el-form-item>
-            <el-button type="primary" class="btn" @click="onSubmit(form)"
-              >用户登录</el-button
-            >
+            <el-button type="primary" class="btn" @click="onSubmit(form)">用户登录</el-button>
           </el-form>
         </div>
       </div>
@@ -75,25 +59,26 @@ export default {
           })
             .then((res) => {
               msgs = res.data.msg;
-              if(res.code==1){
-                     writetoken(res.data.expires_in);
-              window.localStorage.setItem("token", res.data.access_token);
-              window.localStorage.setItem(
-                "refresh_token",
-                res.data.refresh_token
-              );
-              window.localStorage.setItem("tokentype", res.data.token_type);
-              window.localStorage.setItem("user", this.form.Username);
+              if (res.code == 1) {
+                window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心
+                writetoken(res.data.expires_in);
+                window.localStorage.setItem("token", res.data.access_token);
+                window.localStorage.setItem(
+                  "refresh_token",
+                  res.data.refresh_token
+                );
+                window.localStorage.setItem("tokentype", res.data.token_type);
+                window.localStorage.setItem("user", this.form.Username);
 
-              this.$router.push({ path: "home" });
-              this.$store.state.changepassword = this.form.Password;
+                this.$router.push({ path: "home" });
+                this.$store.state.changepassword = this.form.Password;
               }
               this.$message.success(msgs);
 
-              console.log(res,'res');
+              console.log(res, 'res');
               // if (res.code != -1 && res.data.code == 1) {
               //   window.sessionStorage.setItem("peisid", res.data.peisid); //设置当前人员所属体检中心
-           
+
 
               //   return this.$axios.post(
               //     mm.apiurl + "/connect/token",
@@ -127,7 +112,7 @@ export default {
             //   this.$router.push({ path: "home" });
             //   this.$store.state.changepassword = this.form.Password;
             // })
-            .catch((err) => {});
+            .catch((err) => { });
 
           //   console.log(res);
           //   if (res.data.code == 1 && res.code == 1) {

From 6796e019bc553c4d4eedb41153e077fb3e030dc8 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 7 Sep 2023 18:04:25 +0800
Subject: [PATCH 3/3] card

---
 src/store/index.js                      |   6 +-
 src/views/Home.vue                      | 274 +++++------------
 src/views/fee-settings/cardBill.vue     | 376 +++++-------------------
 src/views/fee-settings/cardRegister.vue | 191 ++++++++++--
 src/views/fee-settings/cardType.vue     |  29 +-
 5 files changed, 329 insertions(+), 547 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index f91c9c0..501bb82 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -198,7 +198,11 @@ export default new Vuex.Store({
         { id: "1", displayName: "积分卡" },
       ],
       cardType:[], //会员卡类别
-      billFlag:[],
+      billFlag:[
+        { id: "0", displayName: "收费" },
+        { id: "1", displayName: "退费" },
+        { id: "2", displayName: "充值" },
+      ],
       checkTypeFlag: [
         { id: "0", displayName: "检验" },
         { id: "1", displayName: "功能检查" },
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e7a654f..5bf41d0 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,26 +1,17 @@
 <template>
   <div>
     <el-container style="background: ">
-      <el-header
-        style="background-color: ; line-height: 50px"
-        class="principalheader"
-      >
+      <el-header style="background-color: ; line-height: 50px" class="principalheader">
         <div class="navs">
           <!-- <div class="maintitle">神豚医疗信息系统</div> -->
           <div style="">
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">用户权限管理</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="organization-units"
-                  >科室设置</el-dropdown-item
-                >
+                <el-dropdown-item command="organization-units">科室设置</el-dropdown-item>
                 <el-dropdown-item command="role">角色管理</el-dropdown-item>
-                <el-dropdown-item command="user-list"
-                  >用户管理</el-dropdown-item
-                >
-                <el-dropdown-item command="audit-log"
-                  >安全日志</el-dropdown-item
-                >
+                <el-dropdown-item command="user-list">用户管理</el-dropdown-item>
+                <el-dropdown-item command="audit-log">安全日志</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -29,61 +20,27 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">基础字典</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="guide-type"
-                  >导引类别</el-dropdown-item
-                >
-                <el-dropdown-item command="medical-report-type"
-                  >体检报告类别</el-dropdown-item
-                >
+                <el-dropdown-item command="guide-type">导引类别</el-dropdown-item>
+                <el-dropdown-item command="medical-report-type">体检报告类别</el-dropdown-item>
                 <el-dropdown-item command="sex">性别</el-dropdown-item>
-                <el-dropdown-item command="marital-status"
-                  >婚姻状况</el-dropdown-item
-                >
+                <el-dropdown-item command="marital-status">婚姻状况</el-dropdown-item>
                 <el-dropdown-item command="nation">民族</el-dropdown-item>
                 <el-dropdown-item command="birth-place">籍贯</el-dropdown-item>
-                <el-dropdown-item command="result-status"
-                  >结果状态</el-dropdown-item
-                >
-                <el-dropdown-item command="medical-type"
-                  >体检类别</el-dropdown-item
-                >
-                <el-dropdown-item command="personnel-type"
-                  >人员类别</el-dropdown-item
-                >
-                <el-dropdown-item command="device-type"
-                  >仪器类别</el-dropdown-item
-                >
-                <el-dropdown-item command="sample-type"
-                  >标本类型</el-dropdown-item
-                >
+                <el-dropdown-item command="result-status">结果状态</el-dropdown-item>
+                <el-dropdown-item command="medical-type">体检类别</el-dropdown-item>
+                <el-dropdown-item command="personnel-type">人员类别</el-dropdown-item>
+                <el-dropdown-item command="device-type">仪器类别</el-dropdown-item>
+                <el-dropdown-item command="sample-type">标本类型</el-dropdown-item>
                 <el-dropdown-item command="unit">计量单位</el-dropdown-item>
-                <el-dropdown-item command="diagnosis-postfix"
-                  >诊断后缀</el-dropdown-item
-                >
-                <el-dropdown-item command="medical-conclusion-type"
-                  >体检结论类别</el-dropdown-item
-                >
-                <el-dropdown-item command="medical-conclusion"
-                  >体检结论</el-dropdown-item
-                >
-                <el-dropdown-item command="sample-container"
-                  >标本容器</el-dropdown-item
-                >
-                <el-dropdown-item command="common-char-type"
-                  >常用字符类别</el-dropdown-item
-                >
-                <el-dropdown-item command="common-char"
-                  >常用字符</el-dropdown-item
-                >
-                <el-dropdown-item command="customer-org-type"
-                  >客户单位类别</el-dropdown-item
-                >
-                <el-dropdown-item command="item-default-result"
-                  >项目默认结果</el-dropdown-item
-                >
-                <el-dropdown-item command="diagnosis-level"
-                  >诊断级别</el-dropdown-item
-                >
+                <el-dropdown-item command="diagnosis-postfix">诊断后缀</el-dropdown-item>
+                <el-dropdown-item command="medical-conclusion-type">体检结论类别</el-dropdown-item>
+                <el-dropdown-item command="medical-conclusion">体检结论</el-dropdown-item>
+                <el-dropdown-item command="sample-container">标本容器</el-dropdown-item>
+                <el-dropdown-item command="common-char-type">常用字符类别</el-dropdown-item>
+                <el-dropdown-item command="common-char">常用字符</el-dropdown-item>
+                <el-dropdown-item command="customer-org-type">客户单位类别</el-dropdown-item>
+                <el-dropdown-item command="item-default-result">项目默认结果</el-dropdown-item>
+                <el-dropdown-item command="diagnosis-level">诊断级别</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -92,19 +49,11 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">收费设置</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="invoice-item-type"
-                  >发票项目类别</el-dropdown-item
-                >
+                <el-dropdown-item command="invoice-item-type">发票项目类别</el-dropdown-item>
                 <el-dropdown-item command="pay-mode">支付方式</el-dropdown-item>
-                <el-dropdown-item command="cardType"
-                  >会员卡类别</el-dropdown-item
-                >
-                <el-dropdown-item command="cardRegister"
-                  >会员卡登记</el-dropdown-item
-                >
-                <el-dropdown-item command="cardBill"
-                  >会员卡记账</el-dropdown-item
-                >
+                <el-dropdown-item command="cardType">会员卡类别</el-dropdown-item>
+                <el-dropdown-item command="cardRegister">会员卡管理</el-dropdown-item>
+                <el-dropdown-item command="cardBill">会员卡记账</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -113,14 +62,10 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">常用设置</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="item-type"
-                  >项目类别</el-dropdown-item
-                >
+                <el-dropdown-item command="item-type">项目类别</el-dropdown-item>
                 <el-dropdown-item command="item">项目设置</el-dropdown-item>
                 <el-dropdown-item command="asbitem">组合项目</el-dropdown-item>
-                <el-dropdown-item command="sample-group"
-                  >条码分组</el-dropdown-item
-                >
+                <el-dropdown-item command="sample-group">条码分组</el-dropdown-item>
                 <!-- <el-dropdown-item
                   @click.native="$router.push({ path: '/reference-range' })"
                   >参考范围</el-dropdown-item
@@ -132,24 +77,12 @@
                   >性激素参考范围</el-dropdown-item
                 > -->
                 <el-dropdown-item command="diagnosis">诊断</el-dropdown-item>
-                <el-dropdown-item command="diagnosis-template"
-                  >诊断模板</el-dropdown-item
-                >
-                <el-dropdown-item command="item-result-template"
-                  >项目结果模板</el-dropdown-item
-                >
-                <el-dropdown-item command="item-result-match"
-                  >项目结果匹配</el-dropdown-item
-                >
-                <el-dropdown-item command="item-template"
-                  >项目模板</el-dropdown-item
-                >
-                <el-dropdown-item command="medical-package"
-                  >套餐</el-dropdown-item
-                >
-                <el-dropdown-item command="sys-parm-type"
-                  >系统参数</el-dropdown-item
-                >
+                <el-dropdown-item command="diagnosis-template">诊断模板</el-dropdown-item>
+                <el-dropdown-item command="item-result-template">项目结果模板</el-dropdown-item>
+                <el-dropdown-item command="item-result-match">项目结果匹配</el-dropdown-item>
+                <el-dropdown-item command="item-template">项目模板</el-dropdown-item>
+                <el-dropdown-item command="medical-package">套餐</el-dropdown-item>
+                <el-dropdown-item command="sys-parm-type">系统参数</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -158,27 +91,13 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">体检登记</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="customerOrg"
-                  >体检单位设置</el-dropdown-item
-                >
-                <el-dropdown-item command="customerOrgGroup"
-                  >单位分组设置</el-dropdown-item
-                >
-                <el-dropdown-item command="patientRegister"
-                  >体检人员登记</el-dropdown-item
-                >
-                <el-dropdown-item command="personnelBatch"
-                  >人员批量登记</el-dropdown-item
-                >
-                <el-dropdown-item command="patientRegisterSign"
-                  >体检人员签到</el-dropdown-item
-                >
-                <el-dropdown-item command="patientRegisterRecover"
-                  >体检表回收</el-dropdown-item
-                >
-                <el-dropdown-item command="patientRegisterRefuse"
-                  >弃检登记</el-dropdown-item
-                >
+                <el-dropdown-item command="customerOrg">体检单位设置</el-dropdown-item>
+                <el-dropdown-item command="customerOrgGroup">单位分组设置</el-dropdown-item>
+                <el-dropdown-item command="patientRegister">体检人员登记</el-dropdown-item>
+                <el-dropdown-item command="personnelBatch">人员批量登记</el-dropdown-item>
+                <el-dropdown-item command="patientRegisterSign">体检人员签到</el-dropdown-item>
+                <el-dropdown-item command="patientRegisterRecover">体检表回收</el-dropdown-item>
+                <el-dropdown-item command="patientRegisterRefuse">弃检登记</el-dropdown-item>
                 <el-dropdown-item command="charge">体检收费</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -188,12 +107,8 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link">体检</span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="doctorCheck"
-                  >体检医生诊台</el-dropdown-item
-                >
-                <el-dropdown-item command="sumDoctorCheck"
-                  >总检医生诊台</el-dropdown-item
-                >
+                <el-dropdown-item command="doctorCheck">体检医生诊台</el-dropdown-item>
+                <el-dropdown-item command="sumDoctorCheck">总检医生诊台</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -203,18 +118,10 @@
               <span class="el-dropdown-link">体检查询</span>
               <el-dropdown-menu slot="dropdown" style="width: 170px">
                 <el-dropdown-item command="report">体检报告</el-dropdown-item>
-                <el-dropdown-item command="checkStatus"
-                  >组合项目检查状态</el-dropdown-item
-                >
-                <el-dropdown-item command="chargeAsbitem"
-                  >人员费用组合项目</el-dropdown-item
-                >
-                <el-dropdown-item command="unCheckAsbitem"
-                  >人员未检组合项目</el-dropdown-item
-                >
-                <el-dropdown-item command="patientRegisterRecover"
-                  >回收表格查询</el-dropdown-item
-                >
+                <el-dropdown-item command="checkStatus">组合项目检查状态</el-dropdown-item>
+                <el-dropdown-item command="chargeAsbitem">人员费用组合项目</el-dropdown-item>
+                <el-dropdown-item command="unCheckAsbitem">人员未检组合项目</el-dropdown-item>
+                <el-dropdown-item command="patientRegisterRecover">回收表格查询</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -223,15 +130,9 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 客户报表 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="diseaseStatistics"
-                  >疾病人数统计</el-dropdown-item
-                >
-                <el-dropdown-item command="positiveresults"
-                  >阳性结果人员</el-dropdown-item
-                >
-                <el-dropdown-item command="unitphysicalexamination"
-                  >单位体检报表</el-dropdown-item
-                >
+                <el-dropdown-item command="diseaseStatistics">疾病人数统计</el-dropdown-item>
+                <el-dropdown-item command="positiveresults">阳性结果人员</el-dropdown-item>
+                <el-dropdown-item command="unitphysicalexamination">单位体检报表</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -261,18 +162,10 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 工作量统计 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="registrar"
-                  >登记员工作量</el-dropdown-item
-                >
-                <el-dropdown-item command="doctorstaionworkload"
-                  >医生站工作量</el-dropdown-item
-                >
-                <el-dropdown-item command="directordoctor"
-                  >总检工作量</el-dropdown-item
-                >
-                <el-dropdown-item command="deskwork"
-                  >科室工作量</el-dropdown-item
-                >
+                <el-dropdown-item command="registrar">登记员工作量</el-dropdown-item>
+                <el-dropdown-item command="doctorstaionworkload">医生站工作量</el-dropdown-item>
+                <el-dropdown-item command="directordoctor">总检工作量</el-dropdown-item>
+                <el-dropdown-item command="deskwork">科室工作量</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -282,15 +175,9 @@
             <el-dropdown @command="handleCommand">
               <span class="el-dropdown-link"> 收费 </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="tollcollector"
-                  >收费员报表</el-dropdown-item
-                >
-                <el-dropdown-item command="individualfeedetails"
-                  >个人收费明细</el-dropdown-item
-                >
-                <el-dropdown-item command="membershipcard"
-                  >会员卡分类</el-dropdown-item
-                >
+                <el-dropdown-item command="tollcollector">收费员报表</el-dropdown-item>
+                <el-dropdown-item command="individualfeedetails">个人收费明细</el-dropdown-item>
+                <el-dropdown-item command="membershipcard">会员卡分类</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -303,54 +190,25 @@
                 操作 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="logout"
-                  >退出登录</el-dropdown-item
-                >
-                <el-dropdown-item @click.native="editpassword"
-                  >修改密码</el-dropdown-item
-                >
-                <el-dropdown-item @click.native="toggleDevTools"
-                  >调试工具</el-dropdown-item
-                >
+                <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
+                <el-dropdown-item @click.native="editpassword">修改密码</el-dropdown-item>
+                <el-dropdown-item @click.native="toggleDevTools">调试工具</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </div>
         </div>
       </el-header>
       <!-- 修改密码弹框 -->
-      <el-dialog
-        title="修改密码"
-        :visible.sync="dialogVisible"
-        width="30%"
-        :close-on-click-modal="false"
-      >
-        <el-form
-          :model="form"
-          :rules="rules"
-          ref="ruleForm"
-          label-width="100px"
-        >
+      <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false">
+        <el-form :model="form" :rules="rules" ref="ruleForm" label-width="100px">
           <el-form-item label="旧密码" prop="oldPassWord">
-            <el-input
-              v-model="form.oldPassWord"
-              autocomplete="new-password"
-              show-password
-            ></el-input>
+            <el-input v-model="form.oldPassWord" autocomplete="new-password" show-password></el-input>
           </el-form-item>
           <el-form-item label="新密码" prop="newPassWord">
-            <el-input
-              v-model="form.newPassWord"
-              autocomplete="new-password"
-              show-password
-            ></el-input>
+            <el-input v-model="form.newPassWord" autocomplete="new-password" show-password></el-input>
           </el-form-item>
           <el-form-item label="确认密码" prop="newPassWord">
-            <el-input
-              v-model="confirmpassword"
-              type="password"
-              autocomplete="new-password"
-              show-password
-            ></el-input>
+            <el-input v-model="confirmpassword" type="password" autocomplete="new-password" show-password></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -613,7 +471,7 @@ export default {
     handleCommand(command) {
       if (this.router.path != command) {
         this.router.path = command;
-        this.$router.push({ path: command }).catch(() => {});
+        this.$router.push({ path: command }).catch(() => { });
       }
     },
     //确定修改密码按钮
@@ -667,9 +525,11 @@ export default {
   color: #ccc;
   border: 1px solid #ccc;
 }
+
 .el-dropdown-item {
   text-align: center;
 }
+
 .el-dropdown-menu {
   text-align: center;
   overflow: scroll;
diff --git a/src/views/fee-settings/cardBill.vue b/src/views/fee-settings/cardBill.vue
index bca8612..a926bb7 100644
--- a/src/views/fee-settings/cardBill.vue
+++ b/src/views/fee-settings/cardBill.vue
@@ -1,20 +1,19 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">会员卡记账</div>
+      <div class="publiccss">会员卡记账记录</div>
       <div style="display: flex;margin-top:20px">
-        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
           <div style="display: flex; flex-wrap: wrap; height:80px;">
             <div class="query">
               <span>记账日期</span>
-              <el-date-picker v-model="query.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
-                start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
-                style="width: 240px">
-              </el-date-picker>
+              <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width: 100px" />
+              <span>--</span>
+              <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width: 100px"/>
             </div>
             <div class="query">
               <span>记账标志：</span>
-              <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+              <el-select v-model="query.billFlag" placeholder="请选择" filterable clearable size="small" style="width: 80px">
                 <el-option v-for="item in dict.billFlag" :key="item.id" :label="item.displayName" :value="item.id" />
               </el-select>
             </div>
@@ -26,7 +25,7 @@
             </div>
             <div class="query">
               <span>卡号：</span>
-              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 150px" />
+              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 120px" />
             </div>
             <div class="query">
               <span>卡主姓名：</span>
@@ -34,14 +33,14 @@
             </div>
             <div class="query">
               <span>身份证号：</span>
-              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 200px" />
+              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 180px" />
             </div>
             <div class="query">
-              <span>手机号：</span>
-              <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
+              <span>电话：</span>
+              <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable style="width: 120px" />
             </div>
           </div>
-          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 330 : window.pageHeight - 270"
             row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
             @row-click="rowClick">            
             <el-table-column prop="cardNo" label="会员卡号" width="150" />            
@@ -58,7 +57,7 @@
                 <div>{{ dddw(dict.billFlag, "id", scope.row.billFlag, "displayName") }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creatorName" label="创建人员" width="100" />
             <el-table-column prop="creationTime" label="创建日期" width="150">
               <template slot-scope="scope">
                 <div v-if="scope.row.creationTime">
@@ -66,7 +65,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModifierName" label="修改人员" width="100" />
             <el-table-column prop="lastModificationTime" label="修改日期" width="150">
               <template slot-scope="scope">
                 <div v-if="scope.row.lastModificationTime">
@@ -75,118 +74,14 @@
               </template>
             </el-table-column>
           </el-table>
-
         </div>
         <div style=" margin-left: 10px;width:110px;">
           <div class="listBtn">
             <el-button class="btnClass" @click="btnQuery">查询</el-button>
-          </div>
-          <div class="listBtn">
-            <el-button type="success" class="btnClass" @click="add">新增</el-button>
-          </div>
-          <div class="listBtn">
-            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
-          </div>
-          <div class="listBtn">
-            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
-          </div>
+          </div>          
         </div>
       </div>
-    </el-card>
-    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
-      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="卡类别" prop="cardTypeId">
-              <el-select v-model="form.cardTypeId" placeholder="请选择" filterable>
-                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="会员卡号" prop="cardNo">
-              <el-input v-model="form.cardNo" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="折扣率" prop="discount">
-              <el-input type="number" v-model="form.discount" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="有效期限" prop="expiryDate">
-              <el-input type="date" v-model="form.expiryDate" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="卡主姓名" prop="customerName">
-              <el-input v-model="form.customerName" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="卡主身份证" prop="idNo">
-              <el-input v-model="form.idNo" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="卡主电话" prop="telephone">
-              <el-input type="tel" v-model="form.telephone" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="卡主手机号" prop="mobileTelephone">
-              <el-input type="tel" v-model="form.mobileTelephone" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="启用" prop="cardFlag">
-              <el-radio v-model="form.cardFlag" label="1">是</el-radio>
-              <el-radio v-model="form.cardFlag" label="0">否</el-radio>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="创建人员" label-width="80px">
-              <el-input v-model="form.creatorId" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" label-width="80px">
-              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''"
-                disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="修改人员" label-width="80px">
-              <el-input v-model="form.lastModifierId" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="修改时间" label-width="80px">
-              <el-input :value="form.lastModificationTime
-                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
-        <el-button @click="dialogVisible = false">关闭</el-button>
-      </div>
-    </el-dialog>
+    </el-card>    
   </div>
 </template>
 <script>
@@ -206,89 +101,13 @@ export default {
         dateType:'createDate',
         dateType:'createDate',
       },  //查询条件
-      dataList: [], //列表数据
-      multipleSelection: [], //选中的数据列表
-      dialogVisible: false,
-      form: {
-        id: null,
-        cardTypeId: null,
-        cardNo: '',
-        discount: 100,
-        expiryDate: null,
-        customerName: '',
-        idNo: '',
-        telephone: '',
-        mobileTelephone: '',
-        cardFlag: '0',
-        remark: '',
-      },
-
-      formInit: {},
-
-      rules: {
-        cardTypeId: [
-          { required: true, message: "请填写卡类别", trigger: "blur" },
-        ],
-        cardNo: [
-          { required: true, message: "请填写卡号", trigger: "blur" },
-        ],
-        discount: [
-          { required: true, message: "请填写卡折扣", trigger: "blur" },
-        ],
-        expiryDate: [
-          { required: true, message: "请填写卡有效期", trigger: "blur" },
-        ],
-        customerName: [
-          { required: true, message: "请填写卡主姓名", trigger: "blur" },
-        ],
-        idNo: [
-          { required: true, message: "请填写卡主身份证", trigger: "blur" },
-        ],
-        mobileTelephone: [
-          { required: true, message: "请填写卡主身份证", trigger: "blur" },
-        ],
-        cardFlag: [
-          { required: true, message: "请填写卡启用状态", trigger: "blur" },
-        ]
-      },
-
-      curChoosedRow: {}, //当前选择的行数据
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
+      dataList: [], //列表数据      
     };
   },
 
   created() {
-    this.formInit = { ...this.form };
+    this.query.startDate = new Date();  
+    this.query.endDate = this.query.startDate;
   },
 
   //挂载完成
@@ -302,112 +121,62 @@ export default {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
     dddw, moment,
 
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-
-    rowClick(row) {
-      this.curChoosedRow = row;
-    },
-
-    add() {
-      this.form = { ...this.formInit };
-      this.dialogVisible = true;
-    },
-
-    edit() {
-      if (!this.curChoosedRow.id) {
-        this.$message.warning("请先选择要操作的数据！");
-        return;
-      }
-      this.form = { ...this.curChoosedRow };
-      this.dialogVisible = true;
-    },
-
-    del() {
-      let lfind = -1;
-      if (!this.curChoosedRow.id) {
-        this.$message.warning("请先选择要操作的数据！");
-        return;
-      }
-      //执行删除操作
-      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
-      if (lfind > - 1) this.dataList.splice(lfind, 1);
-      this.curChoosedRow.id = null;
-    },
-
-
-
-    //按条码号查个人数据
-    signByPatientRegisterNo() {
-      let val = this.form.patientRegisterNo
-      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-        .then((res) => {
-          if (res.code != -1) {
-            if (res.data) {
-              this.signCore([res.data.id])
-              this.form.patientRegisterNo = ''
-            }
-          }
-        });
-    },
-
-    //提交
-    onSubmit(formName) {
-      this.$refs[formName].validate((valid, fields) => {
-        if (!valid) {
-          //console.log('fields',fields,Object.keys(fields));
-          this.$message.error(fields[Object.keys(fields)[0]][0].message);
-          return;
-        }
-        //编辑
-        if (this.form.id) {
-
-        } else {
-          //新增
-        }
-      });
-    },
-
-
+       
     //查询
-    btnQuery() {
+    btnQuery(queryType) {
       let body = {}
 
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
-      if (this.patientRegister.query.customerOrgFlag) {
-        if (this.patientRegister.query.CustomerOrgParentId) {
-          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
-        } else {
-          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
-        }
-      }
-
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
-
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
-
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
-
-      //StartDate EndDate
-      if (this.patientRegister.query.dateRange) {
-        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
-        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      console.log('this.query',this.query);
+
+      switch (queryType) {
+        case 'idNo':
+          if(!this.query.idNo) return;
+          body = { idNo: this.query.idNo };
+          break;
+        case 'cardNo':
+        if(!this.query.cardNo) return;
+          body = { cardNo: this.query.cardNo };
+          break;
+        default:
+          if(this.query.idNo){
+            body = { idNo: this.query.idNo };
+          }else if(this.query.cardNo){
+            body = { cardNo: this.query.cardNo };
+          }else{
+            // if(!this.query.startDate) this.query.startDate = moment(new Date()).format('yyyy-MM-DD');
+            // if(!this.query.endDate) this.query.endDate = moment(new Date()).format('yyyy-MM-DD');
+            if(this.query.startDate > this.query.endDate){
+              this.$message.error("数据不合法，起始日期不能大于截止日期！");
+              return;
+            }
+            body.startDate = moment(this.query.startDate).format('yyyy-MM-DD');
+            body.endDate = moment(this.query.endDate).format('yyyy-MM-DD');
+
+            if(this.query.cardModeId) body.cardModeId = this.query.cardModeId;
+            if(this.query.cardTypeId) body.cardTypeId = this.query.cardTypeId;
+            if(this.query.customerName) body.customerName = this.query.customerName;
+            if(this.query.cardFlag) body.cardFlag = this.query.cardFlag;
+            if(this.query.mobileTelephone) body.mobileTelephone = this.query.mobileTelephone;
+          }
+          break;
       }
 
-
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
-
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
-
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
-
-
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
+      // {
+      //   "cardNo": "string",
+      //   "customerName": "string",
+      //   "idNo": "string",
+      //   "mobileTelephone": "string",
+      //   "billFlag": "string",
+      //   "startDate": "string",
+      //   "endDate": "string"
+      // }
+
+      console.log('/api/app/cardbill/getcardbilllist', body)
+      postapi('/api/app/cardbill/getcardbilllist', body)
         .then((res) => {
-          this.dataList = res.data;
+          if (res.code != -1) {
+            this.dataList = res.data;
+          }
         });
     },
 
@@ -435,6 +204,15 @@ export default {
 };
 </script>
 <style scoped>
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 25px;
+}
+::v-deep .el-icon-date:before {
+    content: ""
+}
+
 .query {
   margin-left: 10px;
 }
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 5447749..e4172bc 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">会员卡登记</div>
+      <div class="publiccss">会员卡管理</div>
       <div style="display: flex;margin-top:20px">
         <div :style="'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'">
           <div style="display: flex; flex-wrap: wrap; height:70px;">
@@ -42,7 +42,7 @@
             </div>
             <div class="query">
               <span>卡主姓名：</span>
-              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 80px" />
+              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 100px" />
             </div>
             <div class="query">
               <span>身份证号：</span>
@@ -53,7 +53,7 @@
               <el-input placeholder="手机号/电话" v-model="query.mobileTelephone" size="small" clearable style="width: 120px" />
             </div>
           </div>
-          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 160 : window.pageHeight - 440"
+          <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">
@@ -97,11 +97,8 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-table :data="cardBillList" border width="100%" height="170" row-key="id" size="small" highlight-current-row
-            ref="dataList" @selection-change="handleSelectionChange" @row-click="rowClick">
-            <el-table-column prop="cardNo" label="会员卡号" width="150" />
-            <el-table-column prop="customerName" label="卡主姓名" width="80" />
-            <el-table-column prop="mobileTelephone" label="手机号" width="150" />
+          <el-table :data="cardBillList" border width="100%" height="230" row-key="id" size="small" highlight-current-row
+            ref="dataList" @selection-change="handleSelectionChange" @row-click="rowClick">           
             <el-table-column prop="payModeId" label="支付方式" width="100">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
@@ -142,12 +139,15 @@
             <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
           </div>
           <div class="listBtn">
-            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+            <el-button type="danger" class="btnClass" @click="del">删除</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="primary" class="btnClass" @click="bntOrder">充值</el-button>
           </div>
         </div>
       </div>
     </el-card>
-    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="820px" :close-on-click-modal="false">
       <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
         <el-row>
           <el-col :span="8">
@@ -171,7 +171,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="有效期限" prop="expiryDate">
-              <el-input type="date" v-model="form.expiryDate" />
+              <el-date-picker v-model="form.expiryDate" type="date" placeholder="有效期限" size="small" :style="'width: ' + Math.floor((820-340)/3) + 'px'" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -181,7 +181,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="卡主身份证" prop="idNo">
-              <el-input v-model="form.idNo" />
+              <el-input v-model="form.idNo"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -204,7 +204,16 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="8">
+            <el-form-item label="体检中心" prop="organizationUnitId">
+              <el-select v-model="form.organizationUnitId" placeholder="请选择" filterable :disabled="peisid ? true:false" >
+                <el-option v-for="item in dict.organization" :key="item.id" :label="item.displayName"
+                  :value="item.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" />
             </el-form-item>
@@ -241,6 +250,31 @@
         <el-button @click="dialogVisible = false">关闭</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="会员卡充值" :visible.sync="dialogOrder" width="400px" :close-on-click-modal="false">
+      <el-form ref="order" :model="order" label-width="100px" :rules="orderRules" size="small">
+        <el-col :span="24">
+          <el-form-item label="会员卡号" prop="cardRegisterId">
+            <el-input v-model="order.cardNo" disabled style="width:200px;"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="充值方式" prop="payModeId">
+            <el-select v-model="order.payModeId" placeholder="请选择" filterable :disabled="order.id ? true:false" style="width:200px;">
+              <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </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>
+        </el-col>        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="orderSubmit('order')">确定</el-button>
+        <el-button @click="dialogOrder = false">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -256,6 +290,7 @@ export default {
   },
   data() {
     return {
+      peisid:null,
       query: {
         dateType: 'createDate',
         cardModeId: '',
@@ -285,10 +320,20 @@ export default {
         mobileTelephone: '',
         cardFlag: '0',
         remark: '',
-      },
-
+        organizationUnitId:null,
+      },     
       formInit: {},
 
+      dialogOrder: false,
+      order:{
+        id:'',
+        cardRegisterId:null,
+        cardNo:'', //仅显示用
+        payModeId:'',
+        billMoney:0,
+        billFlag:'2',
+      },
+
       rules: {
         cardTypeId: [
           { required: true, message: "请填写卡类别", trigger: "blur" },
@@ -309,11 +354,26 @@ export default {
           { required: true, message: "请填写卡主身份证", trigger: "blur" },
         ],
         mobileTelephone: [
-          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+          { required: true, message: "请填写卡主手机号", trigger: "blur" },
         ],
         cardFlag: [
           { required: true, message: "请填写卡启用状态", trigger: "blur" },
-        ]
+        ],
+        organizationUnitId: [
+          { required: true, message: "请填写体检中心", trigger: "blur" },
+        ],
+      },
+
+      orderRules: {
+        cardRegisterId: [
+          { required: true, message: "请填写会员卡", trigger: "blur" },
+        ],
+        payModeId: [
+          { required: true, message: "请填写充值方式", trigger: "blur" },
+        ],
+        billMoney: [
+          { required: true, message: "请填写充值金额", trigger: "blur" },
+        ],
       },
 
       curChoosedRow: {}, //当前选择的行数据
@@ -322,6 +382,10 @@ export default {
   },
 
   created() {
+    this.peisid = window.sessionStorage.getItem('peisid');
+    if(!this.form.id){
+      this.form.organizationUnitId = this.peisid;
+    }
     this.query.startDate = new Date();  
     this.query.endDate = this.query.startDate;
     this.formInit = deepCopy(this.form);
@@ -348,6 +412,23 @@ export default {
             this.dict.cardType = res.data;
           }          
         });
+
+      //体检中心
+      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
+        (res) => {
+          if (res.code != -1) {
+            this.dict.organization = res.data;
+          }
+        }
+      );
+
+      //支付方式
+      getapi("/api/app/pay-mode").then((res) => {
+        if (res.code != -1) {
+          this.dict.payMode = res.data;          
+        }
+      });
+
     },
 
     handleSelectionChange(val) {
@@ -357,8 +438,18 @@ export default {
     rowClick(row) {
       this.curChoosedRow = row;
       this.curChoosedId = row.id;
+      this.getCardBill(row.id);      
     },
 
+    //获取卡记账记录
+    getCardBill(cardId){
+      postapi(`/api/app/cardbill/getcardbilllistincardregisterid?CardRegisterId=${cardId}`).then(res =>{
+        if(res.code != -1){
+          this.cardBillList = res.data;
+        }
+      });
+    }, 
+
     add() {
       this.form = deepCopy(this.formInit);
       this.dialogVisible = true;
@@ -380,16 +471,71 @@ export default {
         this.$message.warning("请先选择要操作的数据！");
         return;
       }
-      //执行删除操作
-      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
-      if (lfind > - 1) this.dataList.splice(lfind, 1);
-      this.curChoosedRow.id = null;
+
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        //console.log('{patientRegisterIds}',{patientRegisterIds})
+        return postapi(`/api/app/cardregister/delete?id=${this.curChoosedId}`);
+      }).then(res =>{
+        if(res.code != -1){
+          this.$message.success("操作成功！");
+
+          lfind = arrayExistObj(this.dataList, 'id', this.curChoosedId);
+          if (lfind > - 1) this.dataList.splice(lfind, 1);
+          this.curChoosedId = null;
+        }
+      });   
+      
     },
 
+    bntOrder() {
+      if (!this.curChoosedId) {
+        this.$message.warning("请先选择要充值的会员卡！");
+        return;
+      }
+      this.order = {
+        id:'',
+        cardRegisterId:this.curChoosedId,
+        cardNo:this.curChoosedRow.cardNo,
+        payModeId:'',
+        billMoney:0,
+        billFlag:'2',
+      };
+      this.dialogOrder = true;
+    },
 
+    //充值提交
+    orderSubmit(formName) {
+      let body = {},lfind=-1;
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          //console.log('fields',fields,Object.keys(fields));
+          this.$message.error(fields[Object.keys(fields)[0]][0].message);
+          return;
+        }
+        
+        body = deepCopy(this.form);
+        delete body.id;
+        delete body.cardNo;
+       
+        //充值
+        postapi('/api/app/cardregister/create',body).then(res =>{
+          if(res.code != - 1){
+            this.$message.success("操作成功！");
+            this.getCardBill(this.curChoosedId); 
+            this.dialogOrder = false;
+          }
+        });
+        
+      });
+    },
 
     //提交
     onSubmit(formName) {
+      let body = {},lfind=-1;
       this.$refs[formName].validate((valid, fields) => {
         if (!valid) {
           //console.log('fields',fields,Object.keys(fields));
@@ -410,6 +556,9 @@ export default {
         //   "cardFlag": "string",
         //   "remark": "string"
         // }
+        body = deepCopy(this.form);
+        delete body.id;
+        body.expiryDate = moment(this.form.expiryDate).format('yyyy-MM-DD');
 
         //编辑
         if (this.form.id) {
diff --git a/src/views/fee-settings/cardType.vue b/src/views/fee-settings/cardType.vue
index aa4dbeb..269bd38 100644
--- a/src/views/fee-settings/cardType.vue
+++ b/src/views/fee-settings/cardType.vue
@@ -3,8 +3,8 @@
     <el-card>
       <div class="publiccss">会员卡类别</div>
       <div style="display: flex;margin-top:20px">
-        <div :style="'width:' + (window.pageWidth - 120 - 70) + 'px;'">
-          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 450 : window.pageHeight - 150"
+        <div :style="'width:' + (window.pageWidth - 120 - 80) + 'px;'">
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 410 : window.pageHeight - 190"
             row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
             @row-click="rowClick">
             <el-table-column prop="displayName" label="卡类别名称" width="120" />
@@ -210,7 +210,14 @@ export default {
         return;
       }
 
-      postapi(`/api/app/cardtype/delete?id=${this.curChoosedId}`).then(res =>{
+      this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
+        confirmButtonText: "是",
+        cancelButtonText: "否",
+        type: "warning",
+      }).then(() => {
+        //console.log('{patientRegisterIds}',{patientRegisterIds})
+        return postapi(`/api/app/cardtype/delete?id=${this.curChoosedId}`);
+      }).then(res =>{
         if(res.code != -1){
           this.$message.success("操作成功！");
 
@@ -223,22 +230,6 @@ export default {
     },
 
 
-
-    //按条码号查个人数据
-    signByPatientRegisterNo() {
-      let val = this.form.patientRegisterNo
-      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
-        .then((res) => {
-          if (res.code != -1) {
-            if (res.data) {
-              this.signCore([res.data.id])
-              this.form.patientRegisterNo = ''
-            }
-          }
-        });
-    },
-
     //提交
     onSubmit(formName) {
       let body={},lfind=-1;