Merge remote-tracking branch 'origin/master'

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

@@ -201,7 +201,7 @@
           <el-col :span="8">
             <el-form-item label="支付金额">
               <el-input
-                v-model="checkDetail.payAmount"
+                v-model="checkDetail.amountPaid"
                 class="input-detail"
                 style="width: 82%;"
                 placeholder="-"
@@ -212,12 +212,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费方式">
-              <el-input
-                v-model="checkDetail.payWay"
-                class="input-detail"
-                placeholder="-"
-                disabled
+              <el-select v-model="checkDetail.paymentMethod" class="input-detail" disabled placeholder="-">
+                <el-option
+                  v-for="item in paymentMethodOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -466,6 +468,7 @@ import { parseTime } from '@/utils/ruoyi'
 import { updateCheck } from '@/api/business/mdeicalRecord'
 import { getManage } from '@/api/business/manage'
 import CheckSchedule from '@/views/service-management/medical-record-management/check-schedule.vue'
+import { moneyFormat } from '@/utils'
 
 export default {
   name: 'CheckDetail',
@@ -511,6 +514,29 @@ export default {
           label: '已检查'
         }
       ],
+      // 缴费方式
+      paymentMethodOptions: [
+        {
+          value: '0',
+          label: '现结'
+        },
+        {
+          value: '1',
+          label: '会员卡余额结算'
+        },
+        {
+          value: '2',
+          label: '住院押金结算'
+        },
+        {
+          value: '3',
+          label: '线上支付'
+        },
+        {
+          value: '4',
+          label: '预储值自动扣款'
+        }
+      ],
       // 进度条所需
       scheduleKey: {
         checkSchedule: '', // 查询进度
@@ -555,6 +581,7 @@ export default {
       getManage(id).then(response => {
         console.log('od', response.data)
         this.checkDetail = response.data
+        this.checkDetail.amountPaid = moneyFormat(this.checkDetail.amountPaid)
         this.showTime = {
           payTime: parseTime(this.checkDetail.payTime, '{y}/{m}/{d} {h}:{i}'),
           appointTime: parseTime(this.checkDetail.appointTime, '{y}/{m}/{d} {h}:{i}'), // 下单时间

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

@@ -165,7 +165,7 @@
         <el-col v-if="subscribeMessage.payType !== '2'" :span="8">
           <el-form-item label="支付金额">
             <el-input
-              v-model="subscribeMessage.payAmount"
+              v-model="subscribeMessage.amountPaid"
               class="input-detail"
               placeholder="-"
               disabled

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

@@ -222,7 +222,7 @@
           <span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="120">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="160">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:check:query']"

src/views/service-management/treatment-management/treatment-detail.vue

@@ -214,7 +214,7 @@
           <el-col :span="8">
             <el-form-item label="支付金额">
               <el-input
-                v-model="checkDetail.payAmount"
+                v-model="checkDetail.amountPaid"
                 class="input-detail"
                 style="width: 87%;"
                 placeholder="-"
@@ -225,12 +225,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="缴费方式">
-              <el-input
-                v-model="checkDetail.payWay"
-                class="input-detail"
-                placeholder="-"
-                disabled
+              <el-select v-model="checkDetail.paymentMethod" class="input-detail" disabled placeholder="-">
+                <el-option
+                  v-for="item in paymentMethodOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -638,6 +640,7 @@ import {
 } from '@/api/business/treatment'
 import { parseTime } from '@/utils/ruoyi'
 import TreatmentSchedule from '@/views/service-management/treatment-management/treatment-schedule.vue'
+import { moneyFormat } from '@/utils'
 
 export default {
   name: 'TreatmentDetail',
@@ -694,6 +697,29 @@ export default {
           label: '已治疗'
         }
       ],
+      // 缴费方式
+      paymentMethodOptions: [
+        {
+          value: '0',
+          label: '现结'
+        },
+        {
+          value: '1',
+          label: '会员卡余额结算'
+        },
+        {
+          value: '2',
+          label: '住院押金结算'
+        },
+        {
+          value: '3',
+          label: '线上支付'
+        },
+        {
+          value: '4',
+          label: '预储值自动扣款'
+        }
+      ],
       // 上传报时间
       reportTime: null,
       // 缴费时间
@@ -1042,6 +1068,7 @@ export default {
     getTreatDetails() {
       getTreatDetail(this.treatId).then(res => {
         this.checkDetail = res.data
+        this.checkDetail.amountPaid = moneyFormat(this.checkDetail.amountPaid)
         this.showTime.payTime = parseTime(this.checkDetail.payTime, '{y}/{m}/{d} {h}:{i}')
         console.log('详情', res)
         this.schedule = parseInt(res.data.treatSchedule) + 1

src/views/service-management/treatment-management/treatment-management.vue

@@ -108,7 +108,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
-      <el-table-column label="序号" type="index" align="left" />
+      <el-table-column label="序号" type="index" align="left" min-width="60" />
       <el-table-column label="治疗项目" align="left" :show-overflow-tooltip="true" prop="treatItemsName">
         <template slot-scope="scope">
           <span>{{ scope.row.treatItemsName || '-' }}</span>
@@ -180,7 +180,7 @@
           <span>{{ scope.row.treatmentPeriod || '-'}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="170">
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" min-width="170">
         <template slot-scope="scope">
           <el-button
             v-hasPermi="['business:treat:query']"