Merge remote-tracking branch 'origin/master'

src/views/banner_management/banner_management.vue

@@ -76,7 +76,7 @@
       <el-table
         v-loading="loading"
         :data="bannerList"
-        :header-cell-style="{background:'#E8E9E8'}"
+        :header-cell-style="{background:'#f4f4f4'}"
         @selection-change="handleSelectionChange"
       >
         <el-table-column label="序号" min-width="10px" show-overflow-tooltip type="index" />

src/views/data-statistics/other-components/increasePercentTool.vue

 <template>
   <div>
-    <div v-if="value >= 0" class="upPercentDiv">
+    <div v-if="value > 0" class="upPercentDiv">
       <span v-if="value > 0">+</span>{{ value || 0.0 }}% <img v-if="value > 0" src="../../../assets/data_statistics/caiwu_icon_sheng.png" height="12" width="8">
     </div>
     <div v-else class="downPercentDiv">
-      {{ value || 0.0 }}% <img src="../../../assets/data_statistics/caiwu_icon_zjiang.png" height="12" width="8">
+      {{ value || 0.0 }}% <img v-if="value < 0" src="../../../assets/data_statistics/caiwu_icon_zjiang.png" height="12" width="8">
     </div>
   </div>
 </template>

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

@@ -959,7 +959,7 @@ color: #333333;"
                 <template slot-scope="scope">
                   <span v-if="scope.row.inputShow">-</span>
                   <span v-else>
-                    {{ scope.row.treatStartTime && scope.row.treatStatus === 3 ? moment(scope.row.treatStartTime).format('YYYY/MM/DD') : '-' }}
+                    {{ scope.row.treatStartTime && scope.row.treatStatus === '3' ? moment(scope.row.treatStartTime).format('YYYY/MM/DD') : '-' }}
                   </span>
                 </template>
               </el-table-column>
@@ -1054,16 +1054,14 @@ color: #333333;"
             v-if="!petInHospitalStatus"
             ref="inHosForm"
             :model="inHosForm"
-            :rule="inHosRules"
-            hide-required-asterisk
             class="demo-ruleForm"
+            :inline-message="true"
             label-width="0"
           >
             <el-table
-              ref="inHospitalForm"
               :data="petInHospitalList"
               :header-cell-style="{ background:'#F4F4F4'}"
->
+            >
               <el-table-column align="left" label="病情等级" prop="diseaseLevel">
                 <template slot-scope="scope">
                   <sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn>
@@ -1072,8 +1070,17 @@ color: #333333;"
                     :options="dict.type.disease_level"
                     :value="scope.row.diseaseLevel"
                   />
-                  <el-form-item v-else :prop="'diseaseLevel'" :rule="inHosRules.diseaseLevel">
-                    <el-select v-model="scope.row.diseaseLevel" placeholder="请选择病情等级" clearable="true">
+                  <el-form-item
+                    v-else
+                    prop="diseaseLevel"
+                    :rules="[{ required: true, message: '请选择病情等级', trigger: 'change' }]"
+                  >
+                    <el-select
+                      v-model="inHosForm.diseaseLevel"
+                      placeholder="请选择病情等级"
+                      :clearable="true"
+                      @change="scope.row.diseaseLevel = inHosForm.diseaseLevel"
+                    >
                       <el-option
                         v-for="item in dict.type.disease_level"
                         :key="item.value"
@@ -1094,8 +1101,12 @@ color: #333333;"
                   <span
                     v-if="!petInHospitalUpdateShow"
                   >{{ scope.row.bathe ? (scope.row.bathe === '0' ? '能' : '否') : '-' }}</span>
-                  <el-form-item v-else :prop="'bathe'" :rule="inHosRules.bathe">
-                    <el-select v-model="scope.row.bathe" placeholder="请选择能否沐浴" clearable="true">
+                  <el-form-item
+                    v-else
+                    prop="bathe"
+                    :rules="[{ required: true, message: '请选择能否沐浴', trigger: 'change' }]"
+                  >
+                    <el-select v-model="inHosForm.bathe" placeholder="请选择能否沐浴" clearable="true">
                       <el-option
                         label="能"
                         value="0"
@@ -1145,7 +1156,7 @@ color: #333333;"
                     size="mini"
                     style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
                     type="primary"
-                    @click="updatePetInHospitalShow()"
+                    @click="updatePetInHospitalShow(scope.row)"
                   >编辑
                   </el-button>
                   <el-button
@@ -1486,8 +1497,8 @@ export default {
       checkForm: {}, // 检查table编辑
       treatForm: {}, // 治疗table编辑
       inHosForm: {
-        diseaseLevel: null,
-        bathe: null
+        diseaseLevel: undefined,
+        bathe: undefined
       }, // 住院治疗table编辑
       treatRules: {},
       detailInfo: {
@@ -2100,6 +2111,10 @@ export default {
         this.petInHospitalList = []
         this.petInHospitalList.push(obj)
         this.petInHospitalUpdateShow = true
+        this.inHosForm = {
+          diseaseLevel: undefined,
+          bathe: undefined
+        }
         console.log('lb', this.petInHospitalList)
       }
     },
@@ -2264,16 +2279,22 @@ export default {
       })
     },
     /** 开启编辑病历住院信息 */
-    updatePetInHospitalShow() {
+    updatePetInHospitalShow(row) {
       this.petInHospitalUpdateShow = true
+      this.inHosForm.diseaseLevel = row.diseaseLevel
+      this.inHosForm.bathe = row.bathe
     },
     /** 保存编辑病历住院信息 */
     saveUpdatePetInHospital(row) {
       console.log('修改保存', row)
+      console.log('inHosForm', this.inHosForm)
       this.$refs.inHosForm.validate((valid) => {
+        console.log('校验结果', valid)
         if (valid) {
           row.state = '1'
           const updateForm = JSON.parse(JSON.stringify(this.recordDetail))
+          row.diseaseLevel = this.inHosForm.diseaseLevel
+          row.bathe = this.inHosForm.bathe
           updateForm.inHospitalBo = row
           updateForm.inHospitalBo.createTime = null
           updateForm.createTime = null

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

@@ -77,9 +77,8 @@
                   <el-col :span="8">
                     <!--宠物体重-->
                     <el-form-item label="宠物体重">
-                      <el-input v-model="detailInfo.petWeight" placeholder="-" disabled>
-                        <template #suffix>kg</template>
-                      </el-input>
+                      <el-input v-model="detailInfo.petWeight" placeholder="-" class="inputClass" disabled />
+                      <span style="margin-left: 5px">kg</span>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -414,7 +413,7 @@
         </el-form>
       </div>
       <!--      办理入院弹出框-->
-      <handling-admissions ref="admissions"  :is-show="admissionShow" :in-hospital-info="detailInfo" @admissionModleClose="admissionModleClose" :disease-level="diseaseLevel" />
+      <handling-admissions ref="admissions" :is-show="admissionShow" :in-hospital-info="detailInfo" :disease-level="diseaseLevel" @admissionModleClose="admissionModleClose" />
       <!--      出院办理弹出框-->
       <handle-discharge :is-show="dischargeShow" :flag="disChargeFlag" :in-hospital-info="detailInfo" @disChargModleClose="disChargModleClose" />
       <!--       更改病房弹出框-->
@@ -527,6 +526,11 @@ export default {
 }
 </script>
 
+<style>
+.inputClass{
+  width: 90% !important;
+}
+</style>
 <style scoped lang="scss">
 //整个页面整体布局
 .pet-detail {

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

@@ -233,14 +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--warning--solid--four"
-            type="warning"
-          >导出明细</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>-->
         </template>
       </el-table-column>
     </el-table>

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

@@ -103,8 +103,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="科室" prop="hospitalDepartmentName">
-
-            <el-input v-model="registerForm.hospitalDepartmentName" placeholder="-" :disabled="true" maxlength="20" />
+            <InputTips :text="registerForm.hospitalDepartmentName" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -351,7 +350,7 @@
       <el-button class="queryBtn" icon="el-icon-check" @click="submit">提
         交
       </el-button>
-      <el-button class="backBth" icon="el-icon-back" @click="cancle">返 回</el-button>
+      <el-button class="resetBtn" icon="el-icon-back" @click="cancle">返 回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -363,8 +362,12 @@ import { mapGetters } from 'vuex'
 import { submitPrescribing } from '@/api/business/registration'
 import xiaoshoutishi from '@/assets/images/xiaoshoutishi.png'
 import moment from 'moment'
+import InputTips from '@/components/InputTips/InputTips.vue'
 export default {
   name: 'PrescribingModle',
+  components: {
+    InputTips
+  },
   // 数据字典
   dicts: ['pet_breed', 'pet_sex', 'sterilization_status', 'pet_insure', 'check_type', 'disease_level', 'ward_type'],
   props: {
@@ -784,15 +787,18 @@ export default {
           console.log('我就是为了看预约挂号传值!!!!', temp)
           submitPrescribing(temp).then(res => {
             console.log('看见了吗!!!!', res)
-            if (res.code === 204) {
-              this.$notify.error({
-                title: '错误',
-                message: '当日ICU病房已满'
-              })
-              this.$emit('prescrib-close')
-            }
+            // if (res.code === 204) {
+            //   this.$notify.error({
+            //     title: '错误',
+            //     message: '当日ICU病房已满'
+            //   })
+            //   this.$emit('prescrib-close')
+            // }
             this.$message.success('操作成功')
             this.$emit('prescrib-close')
+          }).catch(err => {
+            console.log('错误信息', err)
+            this.$emit('prescrib-close')
           })
         }
       })