charge

src/components/doctorCheck/RegisterCheckList.vue

@@ -115,15 +115,15 @@ export default {
       postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'pacs_interface_barcode_type' })
         .then(res => {
           if(res.code > -1){
-            this.pacs_interface_barcode_type = res.data||"checkTypeFlag"
+            this.pacs_interface_barcode_type = res.data||"0"
           }
         })
         
-      // 获取系统参数(医生诊台侧边项目归类模式 0-检检类别，1-指引类别，2-报告类别)
+      // 获取系统参数(医生诊台侧边项目归类模式 checkTypeFlag-检检类别，guidTypeId-指引类别，medicalReportTypeId-报告类别)
       postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId:'doctor_check_aside_type' })
         .then(res => {
           if(res.code > -1){
-            this.doctor_check_aside_type = res.data||"0"
+            this.doctor_check_aside_type = res.data||"checkTypeFlag"
           }
         })   
 

src/components/patientRegister/PatientRegisterEdit.vue

@@ -526,10 +526,12 @@
             :disabled="!form.id">收费申请</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '复制分组')" class="btn">
-          <el-button class="commonbutton" @click="btnCopyGroup" :disabled="form.isLock == 'Y' || form.completeFlag == '3' ? true:false">复制分组</el-button>
+          <el-button class="commonbutton" @click="btnCopyGroup"
+            :disabled="form.isLock == 'Y' || form.completeFlag == '3' ? true : false">复制分组</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '复制套餐')" class="btn">
-          <el-button class="commonbutton" @click="btnCopyMedicalPackage" :disabled="form.isLock == 'Y' || form.completeFlag == '3' ? true:false">复制套餐</el-button>
+          <el-button class="commonbutton" @click="btnCopyMedicalPackage"
+            :disabled="form.isLock == 'Y' || form.completeFlag == '3' ? true : false">复制套餐</el-button>
         </div>
       </div>
     </div>
@@ -785,7 +787,7 @@
                     : ""
                 }}
               </template>
-            </el-table-column>            
+            </el-table-column>
           </el-table>
           <div style="display: flex;justify-content: space-between;margin-top: 10px;">
             <div></div>
@@ -2746,22 +2748,27 @@ export default {
       });
     },
 
-    async getAsb(id) {
-      let err = ''
-      try {
-        let res = await getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`)
-        if (res.code > -1) {
-          this.dataTransOpts.tableM.register_check_asbitem = res.data
-        } else {
-          err = res.message
-        }
-      } catch (error) {
-        err = `${error}`
-      }
-      return err
+    // 刷新登记的检查项目
+    getAsb(id) {
+      return new Promise((resolve, reject) => {
+        getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`)
+          .then(res => {
+            if (res.code > - 1) {
+              this.dataTransOpts.tableM.register_check_asbitem = res.data
+              resolve()
+            } else {
+              reject(res.message)
+            }
+          })
+          .catch(err => {
+            reject(err.message)
+          })
+      })
+
     },
 
-    async toCharge(form) {
+    // 跳至收费页面
+    toCharge(form) {
 
       if (!form.patientRegisterNo) {
         this.$message.warning({ showClose: true, message: "请先保存人员信息！" })
@@ -2772,31 +2779,30 @@ export default {
         return
       }
 
-      let err = await this.getAsb(form.id)
-      if (err) {
-        this.$message.error(err)
-        return
-      }
-
-      let chargeMoney = Number(0)
-      //支付方式,比如是0自费、2免费、1单位支付
-      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
-      });
-      if (chargeMoney == 0) {
-        this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
-        return
-      }
-
-      //多次重复点击时，刷新处理
-      this.chargePatientRegisterNo = form.patientRegisterNo
-      this.dataTransOpts.refresh.charge.S++
-      this.dialogWin.charge = true
-
+      this.getAsb(form.id)
+        .then(() => {
+          let chargeMoney = Number(0)
+          //支付方式,比如是0自费、2免费、1单位支付
+          this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+            if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
+          });
+          if (chargeMoney == 0) {
+            this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
+          } else {
+            //多次重复点击时，刷新处理
+            this.chargePatientRegisterNo = form.patientRegisterNo
+            //this.dataTransOpts.refresh.charge.S++
+            this.dialogWin.charge = true
+            this.dataTransOpts.refresh.charge.S++
+          }
+        })
+        .catch(err => {
+          this.$message.error(err.message)
+        })
     },
 
     // 收费申请
-    async chargeRequest(form) {
+    chargeRequest(form) {
       if (!form.id) {
         this.$message.warning({ showClose: true, message: "请先保存人员信息！" })
         return
@@ -2806,50 +2812,54 @@ export default {
         return
       }
 
-      let err = await this.getAsb(form.id)
-      if (err) {
-        this.$message.error(err)
-        return
-      }
 
-      let chargeMoney = Number(0)
-      //支付方式,比如是0自费、2免费、1单位支付
-      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
-      });
-      if (chargeMoney == 0) {
-        this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
-        return
-      }
-
-      // 显示
-      this.dataTransOpts.refresh.charge.S++
-      this.dialogWin.AsbChargeRequest = true
+      this.getAsb(form.id)
+        .then(() => {
+          let chargeMoney = Number(0)
+          //支付方式,比如是0自费、2免费、1单位支付
+          this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+            if (e.payTypeFlag == '0') chargeMoney += Number(e.total)
+          });
 
+          if (chargeMoney == 0) {
+            this.$message.warning({ showClose: true, message: '没有可收费或退费的记录！' })
+          } else {
+            // 显示
+            this.dataTransOpts.refresh.charge.S++
+            this.dialogWin.AsbChargeRequest = true
+          }
+        })
+        .catch(err => {
+          this.$message.error(err.message)
+        })
     },
 
     // 保存立即发送收费申请
-    async immediateToHisCharge(patientRegisterId) {
-      try {
-        let res = await postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
-        if (!(res.code > -1 && res.data.length > 0)) return
-
-        let body = {
-          patientRegisterId,
-          registerCheckAsbitems: []
-        }
+    immediateToHisCharge(patientRegisterId) {
+      postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
+        .then(res => {
+          if (res.code > -1 && res.data.length > 0) {
+            let body = {
+              patientRegisterId,
+              registerCheckAsbitems: []
+            }
 
-        res.data.forEach(e => {
-          body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId })
-        });
+            res.data.forEach(e => {
+              body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId })
+            });
 
-        let resCharge = await postapi("/api/app/ChargeRequest/Create", body)
-        if (resCharge.code > -1) {
-          this.dataTransOpts.refresh.patient_register.S++
-        }
-      } catch (error) {
-        this.$message.error({ showClose: true, message: `${error}` })
-      }
+            // 向 His 或 其他第三方 推送收费申请
+            postapi("/api/app/ChargeRequest/Create", body)
+              .then(resCharge => {
+                if (resCharge.code > -1) {
+                  this.dataTransOpts.refresh.patient_register.S++
+                }
+              })
+          }
+        })
+        .catch(error => {
+          this.$message.error({ showClose: true, message: error.message })
+        })
     },
 
     //关闭收费窗口时，刷新收费状态信息
@@ -2982,7 +2992,7 @@ export default {
     },
 
     // 关闭预约窗口
-    async close_dialogWin_WebBooking() {
+    close_dialogWin_WebBooking() {
       // console.log('this.dataTransOpts.tableS.appoint_patient_register',this.dataTransOpts.tableS.appoint_patient_register)
       // console.log('this.dataTransOpts.tableM.appoint_register_asbitem',this.dataTransOpts.tableM.appoint_register_asbitem)
       // 没有选中网上预约记录，直接返回，不做任何处理
@@ -3000,7 +3010,6 @@ export default {
       this.form.customerOrgParentId = this.dict.personOrgId
       this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001" //默认单位体检次数
 
-      await this.initFormData(this.dataTransOpts.tableS.patient_register.id)
       // "appointPatientRegisterId": "string",
       // "personId": "string",
       // "personName": "string",
@@ -3025,42 +3034,46 @@ export default {
       // "pregnantFlagName": "string",
       // "height": 0,
       // "weight": 0
-      delete appoint_patient_register.medicalCenterId
-      Object.assign(this.form, appoint_patient_register,
-        {
-          patientName: appoint_patient_register.personName,
-          completeFlag: '1',
-        }
-      )
-
-      console.log('this.form', JSON.stringify(this.form))
-      // 明细必填项
-      // "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      // "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-      // "standardPrice": 0,
-      // "chargePrice": 0,
-      // "payTypeFlag": "string",
-      // "isCharge": "string",
-      // "amount": 0
-
-      // 预约明细数据
-      // "appointRegisterAsbitemId": "00000000-0000-0000-0000-000000000000",
-      // "asbitemId": "3a126b34-f6f0-56a1-e899-a092874acde7",
-      // "asbitemName": "腹部平片(立位）",
-      // "itemTypeId": "3a126ac6-2fbf-ca50-82a4-73dcc5a5028b",
-      // "itemTypeName": "放射科",
-      // "appointPatientRegisterId": "3a12ebf4-565a-dbc4-4f2d-d72cd3050cab",
-      // "standardPrice": 45.00,
-      // "chargePrice": 30.50,
-      // "payTypeFlag": "\u0000",
-      // "isCharge": "N",
-      // "amount": 1,
-      // "isInMedicalPackage": "N",
-      // "itemTypeDisplayOrder": 28,
-      // "displayOrder": 1
-      this.dataTransOpts.tableM.register_check_asbitem = deepCopy(this.dataTransOpts.tableM.appoint_register_asbitem)
-
-      this.changeIdNo() //  触发身份证查询档案号
+      this.initFormData(this.dataTransOpts.tableS.patient_register.id)
+        .then(() => {
+          delete appoint_patient_register.medicalCenterId
+          Object.assign(this.form, appoint_patient_register,
+            {
+              patientName: appoint_patient_register.personName,
+              completeFlag: '1',
+            }
+          )
+
+          console.log('this.form', JSON.stringify(this.form))
+          // 明细必填项
+          // "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+          // "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+          // "standardPrice": 0,
+          // "chargePrice": 0,
+          // "payTypeFlag": "string",
+          // "isCharge": "string",
+          // "amount": 0
+
+          // 预约明细数据
+          // "appointRegisterAsbitemId": "00000000-0000-0000-0000-000000000000",
+          // "asbitemId": "3a126b34-f6f0-56a1-e899-a092874acde7",
+          // "asbitemName": "腹部平片(立位）",
+          // "itemTypeId": "3a126ac6-2fbf-ca50-82a4-73dcc5a5028b",
+          // "itemTypeName": "放射科",
+          // "appointPatientRegisterId": "3a12ebf4-565a-dbc4-4f2d-d72cd3050cab",
+          // "standardPrice": 45.00,
+          // "chargePrice": 30.50,
+          // "payTypeFlag": "\u0000",
+          // "isCharge": "N",
+          // "amount": 1,
+          // "isInMedicalPackage": "N",
+          // "itemTypeDisplayOrder": 28,
+          // "displayOrder": 1
+          this.dataTransOpts.tableM.register_check_asbitem = deepCopy(this.dataTransOpts.tableM.appoint_register_asbitem)
+
+          this.changeIdNo() //  触发身份证查询档案号
+        })
+
     },
 
     // 关闭预约窗口--人寿 （团检、个人都可以）
@@ -3174,7 +3187,7 @@ export default {
     // 复制分组时，设置当前顶级单位及体检次数
     setCurParentOrgId() {
       // 获取顶级单位
-      console.log('setCurParentOrgId_this.form.customerOrgId',this.form.customerOrgId)
+      console.log('setCurParentOrgId_this.form.customerOrgId', this.form.customerOrgId)
       this.getParentCustomerOrgId(this.form.customerOrgId)
         .then(res => {
           if (res) {
@@ -3260,21 +3273,31 @@ export default {
     },
 
     //选中套餐
-    async packageRowClick(row) {
-      this.curPackageId = row.id
-      this.packageAsbitems = []
-      try {
-        let res = await postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem', { medicalPackageId: row.id })
-        this.packageAsbitems = res.data
-      } catch (error) {
-        console.log(error)
-      }
+    packageRowClick(row) {
+      return new Promise((resolve, reject) => {
+        this.curPackageId = row.id
+        this.packageAsbitems = []
+        postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem', { medicalPackageId: row.id })
+          .then(res => {
+            if (res.code > -1) {
+              this.packageAsbitems = res.data
+              resolve()
+            } else {
+              reject(res.message)
+            }
+          })
+          .catch(err => {
+            reject(err.message)
+          })
+      })
     },
 
     //双击选套餐，并确认复制
-    async rowDblclick(row) {
-      await this.packageRowClick(row)
-      this.copyMedicalPackage()
+    rowDblclick(row) {
+      this.packageRowClick(row)
+      .then(res => {
+        this.copyMedicalPackage()
+      })      
     },
 
     //复制套餐(确认选中套餐)

src/components/patientRegister/PatientRegisterItem.vue

@@ -10,8 +10,8 @@
         </el-cascader>
       </div>
       <div class="mainareaBox">
-        <el-table :data="dataTransOpts.copyGroup.asbItem" style="border-radius: 5px;" :height="tableHeight" @row-dblclick="dbClickChoosedAsb"
-          highlight-current-row @selection-change="handleSelectionChange" size="small"
+        <el-table :data="dataTransOpts.copyGroup.asbItem" style="border-radius: 5px;" :height="tableHeight"
+          @row-dblclick="dbClickChoosedAsb" highlight-current-row @selection-change="handleSelectionChange" size="small"
           :row-class-name="handleRowClassName" @row-click="chooseAsbItem">
           <!--
           <el-table-column type="selection" align="center" width="40" />
@@ -19,7 +19,8 @@
           <el-table-column prop="displayName" label="未选组合项目">
             <template slot-scope="scope">
               <div>
-                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;" @click="getAsbItems({asbitemName:scope.row.displayName,asbitemId:scope.row.id})" />
+                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;"
+                  @click="getAsbItems({ asbitemName: scope.row.displayName, asbitemId: scope.row.id })" />
                 {{ scope.row.displayName }}
               </div>
             </template>
@@ -57,8 +58,8 @@
         </el-button>
       </div>
       <div v-show="checkPagePriv(pagePriv.privs, '全移除')" class="btnList">
-        <el-button type="danger" class="difference" @click="delAbs(patientRegisterAbsChoosed, 'all')" style="width:90px;"
-          :disabled="isComplete"><i class="el-icon-d-arrow-left"> 全移除</i>
+        <el-button type="danger" class="difference" @click="delAbs(patientRegisterAbsChoosed, 'all')"
+          style="width:90px;" :disabled="isComplete"><i class="el-icon-d-arrow-left"> 全移除</i>
         </el-button>
       </div>
       <!-- 不显示保存，当已选组合有修改时，失去焦点自动保存
@@ -105,7 +106,8 @@
           <el-table-column label="已选组合项目" min-width="150" prop="asbitemName">
             <template slot-scope="scope">
               <div>
-                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;" @click="getAsbItems(scope.row)" />
+                <i class="el-icon-view" style="font-size: 14px;color: black;cursor: pointer;"
+                  @click="getAsbItems(scope.row)" />
                 <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="top">
                   <i v-if="scope.row.isBelongGroupPackage == 'Y'" class="el-icon-star-on"
                     style="padding: 3px; font-size: 14px;color: purple;" />
@@ -145,8 +147,8 @@
               <el-checkbox :value="scope.row.isCharge == 'Y'" true-label="Y" false-label="N" />
             </template>
           </el-table-column>
-          <el-table-column prop="checkCompleteFlag" label="状态" min-width="40" align="center">            
-            <template slot-scope="scope">              
+          <el-table-column prop="checkCompleteFlag" label="状态" min-width="40" align="center">
+            <template slot-scope="scope">
               <div :style="`color: ${setColor(scope.row.checkCompleteFlag)}`">
                 {{ dddw(dict.checkCompleteFlag, "id", scope.row.checkCompleteFlag, "displayName") }}
               </div>
@@ -181,11 +183,11 @@ import { getPagePriv, checkPagePriv, arrayFilter, arrayReduce, arrayExistObj, dd
 export default {
   props: ["prForm", "prAsbOpraOpts", "refreshFormId"],
   data() {
-    return {      
+    return {
       pagePriv: {
         routeUrlorPageName: 'PatientRegisterEdit', //当前页面归属路由或归属页面权限名称
         privs: [] // 页面权限
-      },      
+      },
       LocalConfig: {
         patientRegister: {
           Edit: 'standard', //standard/qztl 人员登记组件版本
@@ -195,7 +197,7 @@ export default {
       },
       oldFormId: '',     //配合登记人员复制新增使用
       itemType: [],     //项目类别
-      
+
       // itemTypeIds: '', //被选中的项目类别ID
       // asbItem: [],      //左侧显示的未选组合项目
       // asbItemAll: [],   //所有未选组合项目
@@ -258,7 +260,7 @@ export default {
       console.log("window.localStorage.getItem('LocalConfig')", error)
     }
     this.dictInit()
-    
+
   },
 
   updated() {
@@ -274,7 +276,7 @@ export default {
   methods: {
     ...mapActions(['getCustomerOrgGroup', 'getPatientRegisterAbs']),
     dddw, moment, deepCopy, checkPagePriv,
-   
+
 
     // 初始化字典信息
     dictInit() {
@@ -1034,11 +1036,20 @@ export default {
       if (!this.discount || this.discount == 0) return
       if (!this.dataTransOpts.tableM.register_check_asbitem || this.dataTransOpts.tableM.register_check_asbitem.length == 0) return
 
+      let total = Number(0)
       this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
-        e.discount = this.discount
-        e.chargePrice = Math.round(e.standardPrice * this.discount) / 100
-        e.total = Math.round(e.standardPrice * this.discount * e.amount) / 100
+        if (e.isCharge == 'N') {
+          e.discount = this.discount
+          e.chargePrice = Math.round(e.standardPrice * this.discount) / 100
+          e.total = Math.round(e.standardPrice * this.discount * e.amount) / 100
+        }
+        total = total + Number(e.total)
       });
+      this.total = Math.round(total * 100) / 100
+
+      this.$nextTick(() => {
+        this.$refs['patientRegister_patientRegisterAbs'].doLayout()
+      })
       // this.onSubmit('')
 
     },
@@ -1053,23 +1064,37 @@ export default {
       let qtyIsOneLast = 0   //数量为1的最后行项目，用于返写金额
 
       // console.log('this.total / this.totalStand',this.total , this.totalStand)
-      this.discount = Math.round((100 * this.total / this.totalStand) * 100) / 100
+      // 过滤已收费的项目
+      let unChargeTotalStand = Number(this.totalStand) //未收费的总标准价
+      let chargeTotal = Number(0)  // 
+      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+        if (e.isCharge == 'Y') {
+          chargeTotal = chargeTotal + Math.round(e.chargePrice * e.amount * 100) / 100
+          unChargeTotalStand = unChargeTotalStand - Math.round(e.standardPrice * e.amount * 100) / 100
+        }
+      });
+
+      let total = this.total - chargeTotal
+      this.discount = Math.round((100 * total / unChargeTotalStand) * 100) / 100
 
       this.dataTransOpts.tableM.register_check_asbitem.forEach((e, index) => {
-        if (e.amount == 1 && e.standardPrice != 0) qtyIsOneLast = index
-        e.discount = this.discount
-        e.chargePrice = Math.round((e.standardPrice * this.discount / 100) * 100) / 100
-        e.total = Math.round((e.standardPrice * this.discount * e.amount / 100) * 100) / 100
-        sumChargeDetails += Math.round((e.standardPrice * this.discount * e.amount / 100) * 100) / 100
+        if (e.isCharge == 'N') {
+          if (e.amount == 1 && e.standardPrice != 0) qtyIsOneLast = index
+          e.discount = this.discount
+          e.chargePrice = Math.round((e.standardPrice * this.discount / 100) * 100) / 100
+          e.total = Math.round((e.standardPrice * this.discount * e.amount / 100) * 100) / 100
+          sumChargeDetails += Math.round((e.standardPrice * this.discount * e.amount / 100) * 100) / 100
+        }
+
       });
       console.log('this.dataTransOpts.tableM.register_check_asbitem', this.dataTransOpts.tableM.register_check_asbitem)
 
       // console.log('this.total - sumChargeDetails', sumChargeDetails, this.total - sumChargeDetails)
       //平衡金额（按总价折扣后，再根据折扣合计 会出现金额差）
-      if (this.total != sumChargeDetails) {
+      if (total != sumChargeDetails) {
         console.log('qtyIsOneLast', qtyIsOneLast)
         this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total =
-          Math.round((Number(this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total) + Number(this.total) - Number(sumChargeDetails)) * 100) / 100
+          Math.round((Number(this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total) + Number(total) - Number(sumChargeDetails)) * 100) / 100
         this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].chargePrice =
           Math.round(this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].total * 100 / this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].amount) / 100
         if (this.dataTransOpts.tableM.register_check_asbitem[qtyIsOneLast].standardPrice != 0) {
@@ -1169,37 +1194,37 @@ export default {
       let content = ""
 
       let length = asbItems.length
-      let modeBase = 1,count = 0,pWidth=390
+      let modeBase = 1, count = 0, pWidth = 390
 
-      if(length >= 30){
+      if (length >= 30) {
         modeBase = 3
-        pWidth=130
-      }else if(length >= 20){
+        pWidth = 130
+      } else if (length >= 20) {
         modeBase = 2
-        pWidth=195
+        pWidth = 195
       }
-      
+
       // 数据项太多时，分列显示
-      asbItems.forEach((e,i) => {
-        if(modeBase == 1){
+      asbItems.forEach((e, i) => {
+        if (modeBase == 1) {
           content += '<p>' + e.itemName + '</p>'
-        }else{
-          if(i==0){
+        } else {
+          if (i == 0) {
             count = 1
             content += `<div style="display: flex;"><p style="width: ${pWidth}px;">` + e.itemName + '</p>'
-          }else if((i+1)%modeBase == 0){
+          } else if ((i + 1) % modeBase == 0) {
             content += `<p style="width: ${pWidth}px;">` + e.itemName + '</p></div><div style="display: flex;">'
             count = 1
-          }else{
+          } else {
             content += `<p style="width: ${pWidth}px;">` + e.itemName + '</p>'
             count++
           }
         }
       });
 
-      if(modeBase > 1){
-        for (let index = 0; index < 3; index++) {          
-          if(modeBase == count) break 
+      if (modeBase > 1) {
+        for (let index = 0; index < 3; index++) {
+          if (modeBase == count) break
           content += '<p></p>'
           count++
         }
@@ -1327,4 +1352,3 @@ export default {
   margin-left: 10px;
 }
 </style>
-

src/components/webBooking/WebBookingMzak.vue

@@ -48,7 +48,8 @@
         <el-table-column label="序号" type="index" width="40" align="center" />
         <el-table-column label="部门名称" width="150" prop="departmentName" align="center" />
         <el-table-column label="子部门" width="150" prop="childCompanyName" align="center" />
-        <el-table-column label="岗位" width="100" prop="positionName" align="center" />
+        <el-table-column label="岗位类别" width="100" prop="positionName" align="center" />
+        <el-table-column label="岗位名称" width="100" prop="position2" align="center" />
         <el-table-column label="姓名" width="80" prop="patientName" align="center" />
         <el-table-column label="身份证号" width="150" prop="idNo" align="center" />
         <el-table-column label="预约时间" width="150" prop="bookingDate" align="center" />
@@ -358,7 +359,8 @@ export default {
       // }
       let ret = Object.assign({}, curRow, {
         mobileTelephone: curRow.phone,
-        personName: curRow.patientName
+        personName: curRow.patientName,
+        jobPost: curRow.position2
       })
       return ret
 

src/views/charge/charge.vue

@@ -276,7 +276,7 @@
             <el-option label="身份证号" value="idNo" />
             <el-option label="手机号" value="phone" />
           </el-select>
-          <el-input placeholder="卡号" v-model="queryCard.value" size="small" clearable style="width: 190px" />
+          <el-input placeholder="卡号" v-model="queryCard.value" size="small" clearable style="width: 190px" @change="btnQueryCard"/>
         </div>
         <div class="query">
           <el-button class="commonbutton" @click="btnQueryCard">查询</el-button>
@@ -442,11 +442,14 @@ export default {
 
   //挂载完成
   mounted() {
+    //this.enterToQuery()
+
     if (this.patientRegisterNo) {
       this.Query('patientRegisterNo');
     } else {
       this.Query();
     }
+
   },
 
   computed: {
@@ -669,6 +672,7 @@ export default {
       console.log('index', index)
       this.cardSeq = index
       this.cardDatas = []  //清除原来的卡列表数据
+      this.queryCard.value = ''
       this.winDialog.queryCard = true  // 显示选卡页面
     },
 
@@ -702,6 +706,10 @@ export default {
     btnOkCard() {
       this.chargePays[this.cardSeq].cardNo = this.cardChoosed.cardNo
       this.chargePays[this.cardSeq].cardRegisterId = this.cardChoosed.id
+      // 将折扣带回，并触发
+      this.form.discount = this.cardChoosed.discount||100
+      this.discountToDetails()      
+
       this.winDialog.queryCard = false
     },
 
@@ -1363,12 +1371,54 @@ export default {
       console.log("dict", this.dict);
     },
 
+    //回车替代查询
+    enterToQuery() {
+      // console.log('enterToTab');
+      this.$nextTick(() => {
+        let inputs = document.querySelectorAll(["input"]); //用数组可以读取多个标签的元素  //.inline-input
+
+        // 为每个输入框添加键盘事件监听器
+        inputs.forEach((input, i) => {
+          // console.log('input',input);
+          input.addEventListener('keydown', (event) => {
+            if (event.keyCode === 13) {
+              // 阻止回车键的默认行为（换行）            
+              event.preventDefault();
+              // 如果按下的是回车查询
+              console.log(input.getAttribute('placeholder'), input.value)
+              let placeholder = input.getAttribute('placeholder')
+              switch (placeholder) {
+                case '卡号':
+                  if (input.value) this.btnQueryCard()
+                  //input.select()
+                  break;                
+              }
+            }
+          });
+
+          input.addEventListener('click', (event) => {
+            let placeholder = input.getAttribute('placeholder')
+            switch (placeholder) {
+              case '条码号':
+              case '档案号':
+              case '姓名':
+              case '检查条码':
+              case '检验条码':
+                input.select()
+                break;
+            }
+          });
+
+        });
+      });
+    },
+
   },
 
   //监听事件()
   watch: {
     "dataTransOpts.refresh.charge.S": {
-      immediate: true, // 立即执行
+      //immediate: true, // 立即执行
       // // deep: true, // 深度监听复杂类型内变化
       handler(newVal, oldVal) {
         console.log(`watch: 收费 newVal: ${newVal}, oldVal: ${oldVal}, 人员条码号: `, this.patientRegisterNo)