Merge remote-tracking branch 'origin/master'

src/assets/styles/index.scss

@@ -122,6 +122,7 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  min-height: calc(100vh - 50px - 24px - 24px - 5px);
 }
 
 .components-container {

src/assets/styles/ruoyi.scss

@@ -90,6 +90,9 @@
 			margin-left: 1px;
 		}
 	}
+  .el-table__empty-block{
+    min-height: 88px;
+  }
 }
 
 /** 表单布局 **/
@@ -132,11 +135,11 @@
   }
 }
 
-.el-table .fixed-width .el-button--mini {
-	padding-left: 0;
-	padding-right: 0;
-	width: inherit;
-}
+ .el-table .fixed-width .el-button--mini {
+   padding: 4px 0;
+   width: inherit;
+   border-radius: 4px!important;
+ }
 
 /** 表格更多操作下拉样式 */
 .el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine {

src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 235px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

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

@@ -89,7 +89,7 @@ export default {
   data() {
     const contentNotNull = (rule, value, callback) => {
       const contentValue = html2Text(value)
-      if (contentValue.length === 0) {
+      if ((contentValue.length === 0 || contentValue.trim().length === 0) && !value.includes('img')) {
         callback(new Error('请输入内容详情'))
       } else {
         callback()

src/views/banner_management/banner_management.vue

@@ -108,7 +108,7 @@
                   icon="el-icon-document"
                   plain
                   size="mini"
-                  style="width: 50px; border-radius: 4px 4px 4px 4px;border: 1px solid #5fb54b;"
+                  style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95, 181, 75);color: #5FB54B;background: rgba(91,182,71,0.08);"
                   type="success"
                   @click="handleDetail(scope.row)"
                 >详情
@@ -120,7 +120,7 @@
                   icon="el-icon-edit"
                   plain
                   size="mini"
-                  style="width: 50px; border-radius: 4px 4px 4px 4px;border: 1px solid #3490CE;"
+                  style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52, 144, 206);color: #3490CE;background: rgba(52,144,206,0.1);"
                   :disabled="scope.row.status === '1'"
                   type="primary"
                   @click="handleUpdate(scope.row)"
@@ -134,7 +134,7 @@
                   icon="el-icon-delete"
                   plain
                   size="mini"
-                  style="width: 50px; border-radius: 4px 4px 4px 4px;border: 1px solid #DB4747;"
+                  style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(219, 71, 71);color: #DB4747;background: rgba(219,71,71,0.08);"
                   type="danger"
                   @click="handleDelete(scope.row)"
                 >删除
@@ -147,7 +147,7 @@
                   icon="el-icon-video-pause"
                   plain
                   size="mini"
-                  style="width: 50px; border-radius: 4px 4px 4px 4px;border: 1px solid #FF9D4E;"
+                  style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255, 157, 78);color: #FF9D4E;background: rgba(255,157,78,0.08);"
                   type="warning"
                   :disabled="scope.row.id === 1"
                   @click="deListBanner(scope.row)"

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

@@ -62,20 +62,20 @@
     <el-row>
       <el-col :span="12" style="padding-bottom: 20px;">
         <el-button
-          icon="el-icon-top-left"
-          class="fourWordsBtn"
+          class="fourWordswhiteBtn"
+          icon="el-icon-finished"
           @click="selectAll()"
         >选择全部
         </el-button>
         <el-button
-          icon="el-icon-top-right"
-          class="fourWordsBtn"
+          class="fourWordswhiteBtn"
+          icon="el-icon-back"
           @click="reverseSelect(userList)"
         >反向选择
         </el-button>
         <el-button
-          class="fourWordsBtn"
-          icon="el-icon-bottom-left"
+          class="fourWordswhiteBtn"
+          icon="el-icon-upload2"
           @click="handleExport"
         >批量导出
         </el-button>

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

@@ -348,7 +348,7 @@
           </div>
 
           <div v-if="detailInfo.status<4" style="padding: 20px;">
-            <el-button v-show="detailInfo.status==='2'" class="fourWordsBtn" icon="el-icon-check" @click="handAdmission">办理入院</el-button>
+            <el-button v-show="detailInfo.status==='2'||detailInfo.status==='0'" class="fourWordsBtn" icon="el-icon-check" @click="handAdmission">办理入院</el-button>
             <el-button v-show="detailInfo.status==='3'" class="fourWordsBtn" icon="el-icon-check" @click="handDisCharge">办理出院</el-button>
             <el-button v-show="detailInfo.status==='3'" class="fourWordsBtn" icon="el-icon-check" @click="changeWard">变更病房</el-button>
             <el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>

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

@@ -62,21 +62,21 @@
 
     <el-row :gutter="10" class="mb8" style="margin: 0 0 20px 1px">
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-finished"
         size="mini"
         @click="selectAll()"
       >选择全部
       </el-button>
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-back"
         size="mini"
         @click="reverseSelect(hospitalList)"
       >反向选择
       </el-button>
       <el-button
-        class="fourWordsBtn"
+        class="fourWordswhiteBtn"
         icon="el-icon-upload2"
         size="mini"
         @click="handleExport()"
@@ -210,7 +210,7 @@
             @click="handleadmission(scope.row)"
           >办理入院</el-button>
           <el-button
-            v-else-if="scope.row.status==='1'"
+            v-else-if="scope.row.status==='1' || scope.row.status==='0'"
             icon="el-icon-paperclip"
             plain
             size="mini"

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -286,6 +286,7 @@
                 clearable
                 placeholder="请选择病房类型"
                 style="width: 100%"
+                disabled="true"
               >
                 <el-option
                   v-for="(item, index) in dict.type.ward_type"
@@ -410,7 +411,8 @@ export default {
             checkType: '',
             checkItemsName: '',
             checkItemsId: '',
-            payAmount: ''
+            payAmount: '',
+            devicePrice: ''
           }
         ],
         treatment: [
@@ -492,6 +494,8 @@ export default {
     changeWardType(prescribingForm) {
       if (prescribingForm.diseaseLevel === '1') {
         prescribingForm.wardType = '2'
+      } else if (prescribingForm.diseaseLevel === null || prescribingForm.diseaseLevel === '') {
+        prescribingForm.wardType = null
       } else {
         prescribingForm.wardType = '1'
       }
@@ -514,7 +518,8 @@ export default {
             return {
               label: item.name,
               value: item.id,
-              payAmount: item.price
+              payAmount: item.price,
+              devicePrice: item.hospitalPlatformPrice
             }
           })
           this.checkKeys = Object.keys(this.checkItemOptions).length
@@ -574,6 +579,7 @@ export default {
         if (item.value === rowData.checkItemsId) {
           rowData.checkItemsName = item.label
           rowData.payAmount = item.payAmount
+          rowData.devicePrice = item.devicePrice
         }
       })
     },
@@ -707,7 +713,8 @@ export default {
             checkType: '',
             checkItemsName: '',
             checkItemsId: '',
-            payAmount: ''
+            payAmount: '',
+            devicePrice: ''
           }
           break
         case 'treatment':

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

@@ -116,14 +116,14 @@
       <el-row v-show="treatSchedule<=1">
         <el-col :span="8">
           <el-form-item label="代缴费金额">
-            <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
+            <span>￥{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row v-show="treatSchedule>1">
         <el-col :span="8">
           <el-form-item label="缴费金额">
-            <span>{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
+            <span>￥{{ keepTwoDecimals(checkDetail.payAmount) }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="8">