Merge remote-tracking branch 'origin/master'

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

@@ -975,6 +975,7 @@ color: #333333;"
             <el-table ref="inHospitalForm" :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border>
               <el-table-column align="center" label="病情等级" prop="diseaseLevel">
                 <template slot-scope="scope">
+                  <sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn>
                   <dict-tag v-if="!petInHospitalUpdateShow" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
                   <el-form-item v-else :prop="'diseaseLevel'" style="height: 55px" :rule="inHosRules.diseaseLevel">
                     <el-select v-model="scope.row.diseaseLevel" placeholder="请选择病情等级" clearable="true">
@@ -995,7 +996,7 @@ color: #333333;"
               </el-table-column>
               <el-table-column align="center" label="能否沐浴" prop="bathe">
                 <template slot-scope="scope">
-                  <span v-if="!petInHospitalUpdateShow">{{ scope.row.bathe === '0' ? '能':'否' }}</span>
+                  <span v-if="!petInHospitalUpdateShow">{{ scope.row.bathe ? (scope.row.bathe === '0' ? '能':'否'):'-' }}</span>
                   <el-form-item v-else :prop="'bathe'" style="height: 55px" :rule="inHosRules.bathe">
                     <el-select v-model="scope.row.bathe" placeholder="请选择能否沐浴" clearable="true">
                       <el-option
@@ -1061,11 +1062,11 @@ color: #333333;"
                   >保存
                   </el-button>
                   <el-button
-                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
+                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && (scope.row.status === '1' || scope.row.status === '2')"
                     icon="el-icon-document"
                     plain
                     size="mini"
-                    style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);"
+                    class="el-button--error--solid"
                     type="danger"
                     @click="delPetInHospital(scope.row)"
                   >删除
@@ -1899,7 +1900,7 @@ export default {
           wardRuleId: '',
           admissionDate: '',
           actualDays: '',
-          status: '1'
+          status: ''
         }
         this.petInHospitalList = []
         this.petInHospitalList.push(obj)
@@ -2074,6 +2075,7 @@ export default {
       console.log('修改保存', row)
       this.$refs.inHosForm.validate((valid) => {
         if (valid) {
+          row.state = '1'
           const updateForm = JSON.parse(JSON.stringify(this.recordDetail))
           updateForm.inHospitalBo = row
           updateForm.inHospitalBo.createTime = null