Merge remote-tracking branch 'origin/master'

src/views/article-management/article-detail.vue

@@ -25,7 +25,7 @@
               :model="form"
               :rules="rules"
               label-width="80px"
-              label-position="left"
+              label-position="right"
               style="padding-left: 13px"
             >
               <el-form-item label="文章标题" prop="articleTitle" style="padding-top: 32px">

src/views/article-management/article-edit.vue

@@ -18,7 +18,7 @@
         <!--   0-- 文章信息的页面--修改文章信息 -->
         <div class="base-msg">
           <div style="display:flex;">
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left">
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="right">
               <el-form-item label="文章标题" prop="articleTitle">
                 <el-input v-model="form.articleTitle" maxlength="60" placeholder="请输入文章标题" />
               </el-form-item>

src/views/article-management/article-insert.vue

@@ -18,7 +18,7 @@
         <!--   0-- 文章信息的页面--新增文章信息 -->
         <div class="base-msg">
           <div style="display:flex;">
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left">
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="right">
               <el-form-item label="文章标题" prop="articleTitle">
                 <el-input v-model.trim="form.articleTitle" maxlength="60" placeholder="请输入文章标题" />
               </el-form-item>

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

@@ -286,7 +286,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="支付金额">
-                <el-input v-model="form.payAmount" :disabled="true" placeholder="-" style=" width: 190px" />
+                <el-input v-model="form.payAmount" :disabled="true" placeholder="-" style=" width: 90%" />
                 <span style="margin-left: 5px">元</span>
               </el-form-item>
             </el-col>

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

@@ -136,11 +136,11 @@
           <span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="支付金额" align="left" prop="payAmount">
-        <template slot-scope="scope">
-          <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
-        </template>
-      </el-table-column>
+            <el-table-column label="支付金额" align="left" prop="payAmount">
+              <template slot-scope="scope">
+                <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
+              </template>
+            </el-table-column>
       <el-table-column label="设备当前状态" align="left" prop="status">
         <template slot-scope="scope">
           <span
@@ -186,6 +186,7 @@
 import { listUseManagement, listUseManagementAll } from '@/api/business/use'
 import { listItemByType } from '@/api/business/item'
 import { getInfo } from '@/api/login'
+import { parseStrEmpty } from '@/utils/ruoyi'
 
 export default {
   name: 'UseManagement',
@@ -285,7 +286,7 @@ export default {
   methods: {
     // 表格显示病房单价保留两位小数
     formatPrice(cellValue) {
-      return cellValue.toFixed(2) + '元'
+      if (parseStrEmpty(cellValue) !== '') { return cellValue.toFixed(2) + '元' }
     },
     // 表单选择框对齐
     cellClass(row) {
@@ -387,6 +388,7 @@ export default {
       listUseManagement(this.queryParams).then(res => {
         this.total = res.total
         this.userList = res.rows
+        console.log('this.userList', this.userList)
         this.loading = false
         console.log('列表', res)
       })

src/views/monitor/job/log.vue

@@ -268,7 +268,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const jobLogIds = this.ids
-      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除调度日志编号为"' + jobLogIds + '"的数据项').then(function() {
         return delJobLog(jobLogIds)
       }).then(() => {
         this.getList()

src/views/monitor/operlog/index.vue

@@ -285,7 +285,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const operIds = row.operId || this.ids
-      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项').then(function() {
         return delOperlog(operIds)
       }).then(() => {
         this.getList()
@@ -294,7 +294,7 @@ export default {
     },
     /** 清空按钮操作 */
     handleClean() {
-      this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function() {
+      this.$modal.confirm('是否确认清空所有操作日志数据项').then(function() {
         return cleanOperlog()
       }).then(() => {
         this.getList()

src/views/monitor/server/index.vue

@@ -200,7 +200,7 @@ export default {
     },
     // 打开加载层
     openLoading() {
-      this.$modal.loading('正在加载服务监控数据，请稍候！')
+      this.$modal.loading('正在加载服务监控数据，请稍候')
     }
   }
 }

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

@@ -345,7 +345,7 @@ export default {
     moneyFormat,
     highlightRow(scope) {
       if (scope.row.diseaseLevel === '1') {
-        return 'height-line'
+        return 'expenditure-highlight-row'
       }
     },
     // 病房下拉框
@@ -492,14 +492,19 @@ export default {
   }
 }
 </script>
-<style>
-.height-line{
-  background-color: rgba(85, 163, 67, 0.2) !important;
-}
-</style>
+<!--<style>-->
+<!--/*.height-line{*/-->
+<!--/*  background: #F6FCF5;*/-->
+<!--//}-->
+<!--</style>-->
 <style scoped lang="scss">
 .app-container{
   background-color: #FFFFFF;
 }
+.el-table{
+  .expenditure-highlight-row {
+    background: #F6FCF5;
+  }
+}
 
 </style>

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

@@ -867,7 +867,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除业务管理-检查管理编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除业务管理-检查管理编号为"' + ids + '"的数据项').then(function() {
         return delManage(ids)
       }).then(() => {
         this.getList()