Merge remote-tracking branch 'origin/master'

src/views/banner_management/banner_management.vue

@@ -152,7 +152,7 @@
                       type="warning"
                       @click="deListBanner(scope.row)"
                       :disabled="scope.row.id === 1"
-                    >下架
+                    >禁用
                     </el-button>
                   </div>
                 </div>
@@ -333,13 +333,13 @@ export default {
         ...this.queryParams
       }, `banner_${new Date().getTime()}.xlsx`)
     },
-    /** 下架轮播图 */
+    /** 禁用轮播图 */
     deListBanner(row) {
       const update = {
         id: row.id,
         status: '2'
       }
-      this.$modal.confirm('是否确认下架该轮播图信息？').then(function() {
+      this.$modal.confirm('是否确认禁用该轮播图信息？').then(function() {
         updateBanner(update).then(res => {
           if (res.code === 200) {
             this.getBannerList()
@@ -348,7 +348,7 @@ export default {
         return null
       }).then(() => {
         this.getBannerList()
-        this.$modal.msgSuccess('下架成功')
+        this.$modal.msgSuccess('禁用成功')
       }).catch(() => {})
     }
   }
@@ -379,13 +379,13 @@ export default {
   color: #666666 !important;
   width: 200px !important;
 }
-/*表格上下架状态颜色样式*/
+/*表格上禁用状态颜色样式*/
 /*上架*/
 ::v-deep .status-grounding {
   color: #67C23A;
 }
 
-/*下架*/
+/*禁用*/
 ::v-deep .status-offshelf {
   color: #f5aa6c;
 }

src/views/equipment-management/use-management/use-management.vue

@@ -244,7 +244,7 @@ export default {
       // 模糊查询
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         isAsc: 'desc',
         orderByColumn: 'c.report_time',
         searchText: '',
@@ -300,7 +300,7 @@ export default {
       this.sortedColumn = ''
       this.queryParams = {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         isAsc: 'desc',
         orderByColumn: 'c.report_time',
         searchText: '',

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

@@ -429,7 +429,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     // 点击 预约信息-立即预约

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

@@ -341,7 +341,7 @@ export default {
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
         checkMessage.checkSchedule = '2' // 把进度改为预约检查
         checkMessage.devicePrice = this.currentPayAmount
-        console.log('需要修改的对象', checkMessage)
+        console.log('需要修改的对象-', checkMessage)
         const list = []
         list.push(checkMessage)
         updateCheck(list).then(res => {
@@ -360,7 +360,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     getList() {},

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

@@ -449,7 +449,7 @@ export default {
       if (price === null) {
         return null
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     /** 表单选择框对齐 */

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

@@ -477,7 +477,7 @@ export default {
       if (price === null) {
         return '-'
       } else {
-        return '￥' + price.toFixed(2)
+        return price.toFixed(2)
       }
     },
     /** 上传报告对话框取消 */