Merge remote-tracking branch 'origin/master'

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -348,7 +348,7 @@
           <el-table-column prop="num" align="left" label="剩余可预约" />
           <el-table-column v-if="currentCheckType === '2'" prop="price" align="left" label="设备服务费">
             <template slot-scope="scope">
-              <span>{{ scope.row.price || '-' }}</span>
+              <span>{{ moneyFormat(scope.row.price) + ' 元' }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="操作">
@@ -360,7 +360,7 @@
                 type="success"
                 style="width: 84px !important; height: 24px;"
                 plain
-                :disabled="parseInt(currentPayAmount) > parseInt(currentHospital.currentBalance)"
+                :disabled="parseInt(scope.row.price) > parseInt(currentHospital.currentBalance)"
                 @click="handleSubscribeDevice(scope.row)"
               >立即预约
               </el-button>
@@ -516,8 +516,6 @@ export default {
       selectableDevice: [],
       // 当前的检查ID
       currentCheckId: null,
-      // 当前的设备服务费
-      currentPayAmount: null,
       // 检查类型(0-自有、2-外部)
       currentCheckType: null,
       updateRow: {},
@@ -748,12 +746,6 @@ export default {
       this.deviceQueryParams.checkTypeList = [...new Set(this.deviceQueryParams.checkTypeList)]
       this.deviceQueryParams.reservationTime = this.getCurrentTime()
       this.currentCheckId = row.id
-      if (row.checkType === '2') {
-        this.currentPayAmount = row.devicePrice
-        this.updateRow = row
-      } else {
-        this.currentPayAmount = row.payAmount
-      }
       this.currentCheckType = row.checkType
       console.log('点击立即预约后的状态', this.deviceQueryParams)
       // 设置检查项目id
@@ -790,7 +782,7 @@ export default {
         checkMessage.checkStartTime = row.checkDate + ' ' + checkTimeList[0]
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
         checkMessage.checkSchedule = '2' // 把进度改为预约检查
-        checkMessage.devicePrice = this.currentPayAmount
+        checkMessage.devicePrice = row.price
         if (this.updateRow.checkType === '2') {
           checkMessage.payAmount = this.updateRow.payAmount
         }
@@ -812,11 +804,6 @@ export default {
         console.log('设备', res)
         this.deviceList = res.rows.table
         this.deviceTotal = res.total
-        if (this.currentCheckType === '2' && this.deviceList.length > 0) {
-          this.deviceList.forEach(item => {
-            item['price'] = this.keepTwoDecimals(this.currentPayAmount) + ' 元'
-          })
-        }
       })
     },
     /** 重置按钮操作 */