Merge remote-tracking branch 'origin/master'

.env.production

@@ -15,7 +15,7 @@ VUE_APP_TEST_API = 'http://47.92.195.144:9000'
 VUE_APP_WEB = 'http://47.92.195.144:80'
 
 # business微服务地址
-VUE_APP_MICRO_BUSINESS = 'http://114.67.241.140:1099'
+VUE_APP_MICRO_BUSINESS = 'http://47.92.195.144:1099'
 
 # finance微服务地址
-VUE_APP_MICRO_FINANCE = 'http://114.67.241.140:1098'
+VUE_APP_MICRO_FINANCE = 'http://47.92.195.144:1098'

.env.test

@@ -8,16 +8,16 @@ NODE_ENV= 'production'
 
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://47.92.55.88:8091'
+VUE_APP_BASE_API = 'https://med.imchong.cn:8091'
 
 # 图片显示
-VUE_APP_TEST_API = 'http://47.92.55.88:9000'
+VUE_APP_TEST_API = 'https://med.imchong.cn:9000'
 
 # A端前端地址
 VUE_APP_WEB = 'http://47.92.55.88:80'
 
 # business微服务地址
-VUE_APP_MICRO_BUSINESS = 'http://114.67.241.140:1099'
+VUE_APP_MICRO_BUSINESS = 'http://47.92.55.88:1099'
 
 # finance微服务地址
-VUE_APP_MICRO_FINANCE = 'http://114.67.241.140:1098'
+VUE_APP_MICRO_FINANCE = 'http://47.92.55.88:1098'

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

@@ -9,7 +9,7 @@
       </div>
       <!--   整体卡片内页面的样式--边距-->
       <div style="padding: 20px 20px 20px 20px;">
-        <el-form ref="form" class="register-detail__form" :model="detailInfo" label-width="81px" size="small">
+        <el-form ref="form" class="register-detail__form" :model="detailInfo" label-width="6.5rem" size="small">
           <!--基本信息-->
           <div style="display: flex">
             <!--   1-- 宠物基本信息的页面--标签头 -->
@@ -77,8 +77,10 @@
                   <el-col :span="8">
                     <!--宠物体重-->
                     <el-form-item label="宠物体重">
-                      <el-input v-model="detailInfo.petWeight" placeholder="-" class="inputClass" disabled />
-                      <span style="margin-left: 5px">kg</span>
+                      <div style="display: flex;align-items: center;">
+                        <el-input v-model="detailInfo.petWeight" placeholder="-" disabled />
+                        <span class="unit-text">kg</span>
+                      </div>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -368,7 +370,9 @@
             <div class="tip-green" />
             <div
               style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
-            >押金充值信息
+            >
+              <span v-if="detailInfo.status<2">押金充值信息</span>
+              <span v-else>押金信息</span>
             </div>
           </div>
 
@@ -385,8 +389,7 @@
               <el-table-column label="操作人" align="center" prop="payRecipient" />
               <el-table-column label="操作项目" align="center" prop="tradeType">
                 <template slot-scope="scope">
-                  <dict-tag v-if="scope.row.tradeType" :options="dict.type.trade_type" :value="scope.row.tradeType" />
-                  <span v-else>-</span>
+                  {{ scope.row.tradeType ? (tradeTypeMapDepositList[scope.row.tradeType] + ((scope.row.detail && scope.row.tradeType !== '7') ? `（${scope.row.detail}）` : '')) : '-' }}
                 </template>
               </el-table-column>
               <el-table-column label="当前余额" align="center" prop="moneyFormat">
@@ -436,6 +439,19 @@ export default {
   dicts: ['pet_sex', 'disease_level', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'other_breed', 'doctor_title', 'ward_type', 'hospital_status_in', 'in_hospital_detail', 'trade_type'],
   data() {
     return {
+      tradeTypeMapDepositList: {
+        '0': '现场门诊诊察',
+        '1': '预约门诊诊察',
+        '2': '药物处理',
+        '3': '辅助检查',
+        '4': '辅助治疗',
+        '5': '住院治疗',
+        '6': '会员充值',
+        '7': '充值',
+        '8': '退费',
+        '9': '设备服务费',
+        '10': '医院预储值'
+      },
       diseaseLevel: '',
       disChargeFlag: '1',
       // 押金信息

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

@@ -233,15 +233,15 @@
             type="warning"
             @click="handleDischargeMe(scope.row)"
           >办理出院</el-button>
-          <!--          <el-button-->
-          <!--            v-else-if="scope.row.status==='4'"-->
-          <!--            icon="el-icon-paperclip"-->
-          <!--            plain-->
-          <!--            size="mini"-->
-          <!--            class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
-          <!--            type="warning"-->
-          <!--            disabled-->
-          <!--          >导出明细</el-button>-->
+                    <el-button
+                      v-else-if="scope.row.status==='4'"
+                      icon="el-icon-paperclip"
+                      plain
+                      size="mini"
+                      class="el-button--warning--solid--four"
+                      type="warning"
+                      disabled
+                    >导出明细</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -779,7 +779,8 @@ export default {
             'diagnosisResult': this.visitForm.diagnosisResult,
             'registTime': this.regiterForm.registrationTime,
             'diagnosisTime': this.regiterForm.diagnosisTime,
-            'petBirthday': this.regiterForm.petBirthday
+            'petBirthday': this.regiterForm.petBirthday,
+            'visitTime': this.regiterForm.visitTime
           }
           console.log('表单参数2333', temp)