Merge remote-tracking branch 'origin/master'

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

@@ -331,7 +331,7 @@
               </div>
             </div>
 
-            <div style="padding: 20px;">
+            <div style="padding: 20px 0 20px 20px;">
               <el-table :data="hosDetailBos" style="cursor: pointer;">
                 <el-table-column label="病房类型" align="left" prop="wardType">
                   <template slot-scope="scope">
@@ -376,7 +376,7 @@
             </div>
           </div>
 
-          <div style="padding: 30px 20px 30px 20px;">
+          <div style="padding: 30px 0px 30px 16px;">
             <el-table :data="finTradeHis" style="cursor: pointer;">
               <el-table-column label="时间" align="left" prop="createTime" />
               <el-table-column label="金额" align="left" prop="paymentAmount">
@@ -399,7 +399,7 @@
             </el-table>
           </div>
 
-          <div v-if="detailInfo.status<4" >
+          <div v-if="detailInfo.status<4" style="margin-left: -1rem;padding-left: 16px;">
             <el-button v-show="detailInfo.status==='2'||detailInfo.status==='0'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handAdmission">办理入院</el-button>
             <el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handDisCharge">办理出院</el-button>
             <el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="changeWard">变更病房</el-button>
@@ -407,7 +407,7 @@
             <el-button class="fourWordswhiteBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
           </div>
 
-          <div v-else style="padding-left: 20px">
+          <div v-else style="padding-left: 16px;">
             <el-button class="fourWordswhiteBtn" icon="el-icon-document-remove" disabled>查看入院单</el-button>
             <el-button class="fourWordswhiteBtn" icon="el-icon-document-remove" disabled>查看出院单</el-button>
             <el-button class="fourWordswhiteBtn" icon="el-icon-back" @click="goBack">返 回</el-button>

src/views/service-management/registration-queue/registration-detail.vue

@@ -371,6 +371,7 @@
                     <!--缴费时间-->
                     <el-form-item label="缴费时间">
                       <el-date-picker
+                        v-if="detailInfo.payStatus !== '2'"
                         v-model="detailInfo.payTime"
                         clearable
                         disabled
@@ -379,6 +380,7 @@
                         value-format="yyyy-MM-dd"
                         format="yyyy/MM/dd HH:mm:ss"
                       />
+                      <el-input v-else v-model="blank" placeholder="-" disabled />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -580,6 +582,7 @@ export default {
   },
   data() {
     return {
+      blank: '-',
       defaultImage: petPic,
       submiting: false, // 提交按钮loading flag
       // 进度