Merge remote-tracking branch 'origin/master'

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

@@ -1155,7 +1155,7 @@ color: #333333;"
               </el-table-column>
               <el-table-column align="left" label="入住日期" prop="admissionDate">
                 <template slot-scope="scope">
-                  {{ scope.row.admissionDate || '-' }}
+                  {{ scope.row.admissionDate ? parseTime(scope.row.admissionDate, '{y}/{m}/{d}'):'-' }}
                 </template>
               </el-table-column>
               <el-table-column align="left" label="天数" prop="actualDays">
@@ -1232,7 +1232,7 @@ color: #333333;"
             </el-table-column>
             <el-table-column align="left" label="入住日期" prop="admissionDate">
               <template slot-scope="scope">
-                {{ scope.row.admissionDate || '-' }}
+                {{ scope.row.admissionDate ? parseTime(scope.row.admissionDate, '{y}/{m}/{d}'):'-' }}
               </template>
             </el-table-column>
             <el-table-column align="left" label="天数" prop="actualDays">
@@ -2638,11 +2638,11 @@ export default {
   margin-right: 5px;
 }
 
-::v-deep .waitInHos {
+::v-deep .waitHos {
   color: #D94343;
 }
 
-::v-deep .waitInHos::before {
+::v-deep .waitHos::before {
   content: "·";
   font-size: 14px;
   margin-right: 5px;

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

@@ -142,7 +142,11 @@
       @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="序号" align="left" min-width="60" :show-overflow-tooltip="true" prop="index">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column v-if="!isPlatRole" label="检查类型" align="left" prop="checkType" min-width="90">
         <template slot-scope="scope">
           <dict-tag

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

@@ -55,7 +55,7 @@
         class="fourWordswhiteBtn"
         @click="selectAll()"
       >
-        <svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
+        <svg-icon style="margin-right: 1px;" icon-class="shuaixuan_icon_quanbu" />
         选择全部
       </el-button>
       <el-button
@@ -64,7 +64,7 @@
         size="mini"
         @click="reverseSelect(treatmentList)"
       >
-        <svg-icon icon-class="shuaixuan_icon_fanxiang" />
+        <svg-icon style="margin-right: 1px;" icon-class="shuaixuan_icon_fanxiang" />
         反向选择
       </el-button>
       <el-button
@@ -73,7 +73,7 @@
         size="mini"
         @click="handleExport"
       >
-        <svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />
+        <svg-icon style="margin-right: 1px;" icon-class="shaixuan_icon_daochu" />
         批量导出
       </el-button>
       <el-button
@@ -112,7 +112,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
-      <el-table-column label="序号" type="index" align="left" min-width="60" />
+      <el-table-column label="序号" align="left" min-width="60" :show-overflow-tooltip="true" prop="index">
+        <template slot-scope="scope">
+          <span>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="治疗项目" align="left" :show-overflow-tooltip="true" prop="treatItemsName">
         <template slot-scope="scope">
           <span>{{ scope.row.treatItemsName || '-' }}</span>