Merge remote-tracking branch 'origin/master'

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

@@ -257,7 +257,7 @@ color: #333333;"
                     v-model="detailInfo.petOwnerBo.createTime"
                     clearable
                     disabled
-                    :placeholder="isEdit? '请选择宠物生日' : '暂无数据'"
+                    :placeholder="isEdit? '请选择创建日期' : '暂无数据'"
                     type="date"
                     value-format="yyyy/MM/dd"
                     format="yyyy/MM/dd"
@@ -434,13 +434,13 @@ color: #333333;"
             </el-col>
           </el-row>
         </el-form>
-        <!--7--用药信息-->
+        <!--7--药物处理-->
         <div class="title-content">
           <div class="title-left">
             <div class="tip-green" />
             <div
               class="tip-text"
-            >用药信息
+            >药物处理
             </div>
           </div>
           <el-button
@@ -525,6 +525,15 @@ color: #333333;"
                   </span>
                 </template>
               </el-table-column>
+
+              <el-table-column align="center" label="销售数量" prop="sallNum">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.inputShow">-</span>
+                  <span v-else>
+                    {{ scope.row.sallNum ? scope.row.sallNum + scope.row.sallUnit  : '-' }}
+                  </span>
+                </template>
+              </el-table-column>
               <el-table-column align="center" label="取药状态" prop="status">
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
@@ -604,7 +613,7 @@ color: #333333;"
             <div class="tip-green" />
             <div
               class="tip-text"
-            >检查信息
+            >辅助检查
             </div>
           </div>
           <el-button
@@ -689,15 +698,12 @@ color: #333333;"
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column align="center" label="缴费状态" prop="payType">
+              <el-table-column align="center" label="检查设备" prop="checkSchedule">
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
-                  <dict-tag
-                    v-else
-                    :options="dict.type.payment_status"
-                    :value="scope.row.payType"
-                    class="content-style"
-                  />
+                  <span v-else>
+                    {{ scope.row.deviceName ? (scope.row.deviceName) : '-' }}
+                  </span>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="检查状态" prop="checkSchedule">
@@ -724,6 +730,17 @@ color: #333333;"
                   </span>
                 </template>
               </el-table-column>
+              <el-table-column align="center" label="缴费状态" prop="payType">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.inputShow">-</span>
+                  <dict-tag
+                    v-else
+                    :options="dict.type.payment_status"
+                    :value="scope.row.payType"
+                    class="content-style"
+                  />
+                </template>
+              </el-table-column>
               <el-table-column
                 v-if="isEdit"
                 align="center"
@@ -784,7 +801,7 @@ color: #333333;"
             <div class="tip-green" />
             <div
               class="tip-text"
-            >治疗信息
+            >辅助治疗
             </div>
           </div>
           <el-button

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

@@ -176,10 +176,9 @@
           <span>{{ scope.row.wardRuleId || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="押金金额" align="center" prop="deposit" :show-overflow-tooltip="true">
+      <el-table-column label="押金余额" align="center" prop="deposit" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <span>{{ scope.row.deposit || '-' }}</span>
-          <span v-show="scope.row.deposit!==null">元</span>
+          <span>{{ scope.row.deposit || '0.00' }}元</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">

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

@@ -426,12 +426,12 @@
         </el-table-column>
         <el-table-column align="left" label="治疗时长">
           <template slot-scope="scope">
-            <span>{{ scope.row.useTimeRange || '-' }}</span>
+            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="userName" align="left" label="治疗负责人">
           <template slot-scope="scope">
-            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
+            <span>{{ scope.row.person_name }}</span>
           </template>
         </el-table-column>
       </el-table>

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

@@ -290,12 +290,12 @@
         </el-table-column>
         <el-table-column align="left" label="治疗时长">
           <template slot-scope="scope">
-            <span>{{ scope.row.useTimeRange || '-' }}</span>
+            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="userName" align="left" label="治疗负责人">
           <template slot-scope="scope">
-            <span>{{ scope.row.duration + 'h'|| '-' }}</span>
+            <span>{{ scope.row.person_name }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -688,11 +688,24 @@ export default {
       this.reservationForm.consultRoomName = ''
       this.appointmentRoomList = []
       // 预约诊室
+      // 添加预约表单参数
       this.reservationForm = {
+        id: '',
+        treatId: '',
+        treatSchedule: '',
+        consultRoomName: '',
         consultId: '',
         useDate: '',
+        treatEndTime: '',
+        treatStartTime: '',
+        useTimeRange: '',
+        treatType: '0',
+        userId: '',
+        userName: '',
+        startTime: [],
         sTime: '',
-        eTime: ''
+        eTime: '-',
+        duration: ''
       }
       // 分配诊室搜索预约记录
       this.allocationForm = {