文章编辑二次弹窗按钮×的修复

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

@@ -206,7 +206,7 @@ color: #333333;"
                   v-model="detailInfo.insure"
                   :disabled="!isEdit"
                   clearable
-                  :placeholder="isEdit? '请选择宠物保险情况' : '暂无数据'"
+                  :placeholder="isEdit? '请选择宠物是否已购保险' : '暂无数据'"
                   style="width: 100%"
                 >
                   <el-option
@@ -395,6 +395,7 @@ color: #333333;"
                   maxlength="400"
                   :placeholder="isEdit? '请输入患者主诉' : '暂无数据'"
                   type="textarea"
+                  show-word-limit
                   style="width: 85% !important"
                 />
               </el-form-item>
@@ -403,6 +404,7 @@ color: #333333;"
               <el-form-item label="医嘱" prop="doctorAdvice">
                 <el-input
                   v-model="detailInfo.doctorAdvice"
+                  show-word-limit
                   :disabled="!isEdit"
                   maxlength="200"
                   :placeholder="isEdit? '请输入医嘱' : '暂无数据'"
@@ -415,6 +417,7 @@ color: #333333;"
               <el-form-item label="诊断结果" prop="diagnosisResult">
                 <el-input
                   v-model="detailInfo.diagnosisResult"
+                  show-word-limit
                   :disabled="!isEdit"
                   maxlength="30"
                   :placeholder="isEdit? '请输入诊断结果' : '暂无数据'"
@@ -1036,7 +1039,7 @@ export default {
         ],
         // 绝育情况非空校验
         sterilizationStatus: [
-          { required: true, message: '请选择绝育情况', trigger: 'change' }
+          { required: true, message: '请选择宠物绝育情况', trigger: 'change' }
         ],
         // 疫苗情况非空校验
         vaccineSituation: [
@@ -1044,7 +1047,7 @@ export default {
         ],
         // 保险情况非空校验
         insure: [
-          { required: true, message: '请选择保险情况', trigger: 'change' }
+          { required: true, message: '请选择宠物是否已购保险', trigger: 'change' }
         ],
         // 主诉非空校验
         mainSuit: [
@@ -1163,15 +1166,15 @@ export default {
       // 品种数据字典
       options: [{
         value: '0',
-        label: '猫',
+        label: '宠物猫',
         children: []
       }, {
         value: '1',
-        label: '狗',
+        label: '宠物狗',
         children: []
       }, {
         value: '2',
-        label: '其它',
+        label: '异宠类',
         children: []
       }],
       // 图片访问
@@ -1284,10 +1287,25 @@ export default {
         'petBirthday': this.detailInfo.petBirthday,
         'followStatus': this.detailInfo.followStatus
       }
-      console.log('RRRRRRRRRR', temp)
-      editRecord(temp).then(res => {
-        console.log('editRecord', res)
-        this.$router.push('/medical-record-management/index')
+      console.log('病例编辑页的提交字段大集合!!!', temp)
+      this.$confirm('系统将立即发布编辑内容,是否确定?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        confirmButtonClass: 'queryBtn',
+        type: 'warning'
+      }).then(() => {
+        editRecord(temp).then(res => {
+          this.$message({
+            type: 'success',
+            message: '修改成功'
+          })
+          this.goBack()
+          console.log('editRecord', res)
+          this.$router.push('/medical-record-management/index')
+        })
+        this.goBack()
       })
     },
     // 设置当前行检查名称

src/views/service-management/registration-queue/components/choose-pet.vue

 <template>
-  <el-dialog :close-on-click-modal="false" class="pet-choose-modle" title="选择宠物" :visible.sync="isShow" :before-close="closeModle" width="50%" append-to-body>
+  <el-dialog
+    :close-on-click-modal="false"
+    class="pet-choose-modle"
+    title="选择宠物"
+    :visible.sync="isShow"
+    :before-close="closeModle"
+    width="50%"
+    append-to-body
+  >
     <el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="100px" size="small">
       <div class="basicInformation">
         <div class="title">方式一：输入宠物ID查询</div>
@@ -47,23 +55,23 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column align="center" min-width="30" reserve-selection type="selection" />
-      <el-table-column align="center" label="序号" min-width="80" show-overflow-tooltip type="index" />
-      <el-table-column align="center" label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
+      <el-table-column label="序号" min-width="80" show-overflow-tooltip type="index" />
+      <el-table-column label="宠主姓名" min-width="80" prop="ownerName" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.ownerName || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
+      <el-table-column label="手机号" min-width="80" prop="phone" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.phone || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
+      <el-table-column label="会员等级" min-width="80" prop="membershipLevel" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.membershipLevel || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
+      <el-table-column label="会员卡余额" min-width="80" prop="balance" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ scope.row.balance || '-' }}</span>
         </template>
@@ -81,7 +89,6 @@
       <!--        show-overflow-tooltip-->
       <!--     />-->
       <el-table-column
-        align="center"
         label="宠物品种"
         prop="petBreed"
       >
@@ -89,10 +96,9 @@
           {{ scope.row.petBreed }}/{{ scope.row.petChildBreed }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
+      <el-table-column label="宠物性别" min-width="60" prop="petSex" show-overflow-tooltip>
         <template slot-scope="scope">
-          <i v-if="scope.row.petSex === '0'" class="el-icon-male" />
-          <i v-else-if="scope.row.petSex === '1'" class="el-icon-female" />
+          <dict-tag :options="dict.type.pet_sex" :value="scope.row.petSex" />
         </template>
       </el-table-column>
     </el-table>
@@ -114,9 +120,10 @@
 <script>
 import { getPetInfo } from '@/api/business/registration'
 import { deepClone } from '@/utils'
+
 export default {
   // 数据字典
-  dicts: ['pet_breed', 'cat_breed', 'dog_breed', 'other_breed'],
+  dicts: ['pet_sex', 'pet_breed', 'cat_breed', 'dog_breed', 'other_breed'],
   name: 'ChoosePet',
   props: {
     isShow: {
@@ -160,15 +167,15 @@ export default {
       },
       options: [{
         value: '0',
-        label: '猫',
+        label: '宠物猫',
         children: []
       }, {
         value: '1',
-        label: '狗',
+        label: '宠物狗',
         children: []
       }, {
         value: '2',
-        label: '其它',
+        label: '异宠类',
         children: []
       }]
     }
@@ -252,8 +259,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.pet-choose-modle{
-  .basicInformation{
+.pet-choose-modle {
+  .basicInformation {
     .title {
       //border-bottom: 1px solid #EFEFEF;
       color: #333333;
@@ -263,15 +270,16 @@ export default {
       flex: 1;
       position: relative;
       margin-bottom: 5px;
+
       &::before {
-       content: '';
-       display: block;
-       background-color: #5FB54B;
-       position: absolute;
-       left: -13px;
-       top: -4px;
-       bottom: -2px;
-       width: 3px;
+        content: '';
+        display: block;
+        background-color: #5FB54B;
+        position: absolute;
+        left: -13px;
+        top: -4px;
+        bottom: -2px;
+        width: 3px;
       }
     }
   }

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

@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item prop="name" label="医生ID:">
-            <el-input v-model="doctorForm.id" :disabled="true" maxlength="20" />
+            <el-input v-model="doctorForm.ruleId" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -29,7 +29,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item prop="name" label="当前诊位:">
-            <el-input v-model="doctorForm.consultingRoom" :disabled="true" maxlength="20" />
+            <el-input v-model="doctorForm.positionName" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="24">

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

@@ -4,7 +4,7 @@
       <!--      标题区域-->
       <div class="prescribing-head">
         <div class="prescribing-title">
-          {{ name }}处方单
+          {{ registerForm.hospitalName }}处方单
         </div>
         <!--      处方单号-->
         <div class="prescribing-no">
@@ -58,7 +58,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="诊断时间" prop="visitDate">
-            <el-input v-model="defaultValue.date" placeholder="暂无数据" :disabled="true" maxlength="20" />
+            <el-input v-model="registerForm.reportTime" placeholder="暂无数据" :disabled="true" maxlength="20" />
           </el-form-item>
         </el-col>
         <el-col :span="8">

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

@@ -159,7 +159,7 @@
               v-model="form.vaccineSituation"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择疫苗情况' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物疫苗情况' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -177,7 +177,7 @@
               v-model="form.insure"
               :disabled="!isEdit"
               clearable
-              :placeholder="isEdit? '请选择宠物保险' : '暂无数据'"
+              :placeholder="isEdit? '请选择宠物是否已购保险' : '暂无数据'"
               style="width: 100%"
             >
               <el-option
@@ -370,7 +370,7 @@ export default {
       rules: {
         // 宠物昵称非空校验
         petNickname: [
-          { required: true, message: '请选择宠物昵称', trigger: 'change' }
+          { required: true, message: '请输入宠物昵称', trigger: 'change' }
         ],
         // 宠物性别非空校验
         petSex: [
@@ -391,15 +391,15 @@ export default {
         ],
         // 绝育情况非空校验
         sterilizationStatus: [
-          { required: true, message: '请选择绝育情况', trigger: 'change' }
+          { required: true, message: '请选择宠物绝育情况', trigger: 'change' }
         ],
         // 疫苗情况非空校验
         vaccineSituation: [
-          { required: true, message: '请选择疫苗情况', trigger: 'change' }
+          { required: true, message: '请选择宠物疫苗情况', trigger: 'change' }
         ],
         // 保险情况非空校验
         insure: [
-          { required: true, message: '请选择保险情况', trigger: 'change' }
+          { required: true, message: '请选择宠物是否已购保险', trigger: 'change' }
         ],
         // 宠主手机号非空校验
         masterPhone: [

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

@@ -205,7 +205,7 @@ color: #333333;"
             </el-row>
             <el-row>
               <el-col :span="8">
-                <el-form-item label="创建时间">
+                <el-form-item label="创建日期">
                   <span class="content-style">
                     <el-date-picker
                       v-model="detailInfo.petOwnerBo.createTime"
@@ -214,6 +214,7 @@ color: #333333;"
                       placeholder="暂无数据"
                       type="date"
                       value-format="yyyy-MM-dd"
+                      format="yyyy/MM/dd"
                     />
                   </span>
                 </el-form-item>
@@ -304,7 +305,8 @@ color: #333333;"
                         placeholder="暂无数据"
                         disabled
                         type="date"
-                        value-format="yyyy/MM/dd HH:mm:ss"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy/MM/dd HH:mm:ss"
                       />
                     </el-form-item>
                   </el-col>
@@ -332,7 +334,8 @@ color: #333333;"
                         disabled
                         placeholder="暂无数据"
                         type="date"
-                        value-format="yyyy/MM/dd"
+                        value-format="yyyy-MM-dd"
+                        format="yyyy/MM/dd"
                       />
                     </el-form-item>
                   </el-col>
@@ -377,6 +380,7 @@ color: #333333;"
                         type="date"
                         placeholder="暂无数据"
                         value-format="yyyy-MM-dd"
+                        format="yyyy/MM/dd HH:mm:ss"
                       />
                     </el-form-item>
                   </el-col>
@@ -415,6 +419,7 @@ color: #333333;"
                           placeholder="暂无数据"
                           type="date"
                           value-format="yyyy-MM-dd"
+                          format="yyyy/MM/dd HH:mm:ss"
                         />
                       </el-form-item>
                     </el-col>
@@ -440,6 +445,7 @@ color: #333333;"
                         <el-input
                           v-model="visitForm.mainSuit"
                           maxlength="400"
+                          show-word-limit
                           placeholder="请输入患者主诉"
                           type="textarea"
                         />
@@ -459,6 +465,7 @@ color: #333333;"
                       >
                         <el-input
                           v-model.trim="visitForm.doctorAdvice"
+                          show-word-limit
                           maxlength="200"
                           placeholder="请输入医嘱"
                           type="textarea"
@@ -479,6 +486,7 @@ color: #333333;"
                       >
                         <el-input
                           v-model.trim="visitForm.diagnosisResult"
+                          show-word-limit
                           maxlength="30"
                           placeholder="请输入诊断结果"
                           style="width: 90% !important"
@@ -634,15 +642,15 @@ export default {
       // 品种数据字典
       options: [{
         value: '0',
-        label: '猫',
+        label: '宠物猫',
         children: []
       }, {
         value: '1',
-        label: '狗',
+        label: '宠物狗',
         children: []
       }, {
         value: '2',
-        label: '其它',
+        label: '异宠类',
         children: []
       }],
       // 图片访问

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

@@ -194,7 +194,6 @@
               plain
               size="mini"
               style="width: 70px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(255,157,78);"
-              :disabled="scope.row.isAdd === '1'"
               type="warning"
               @click="handleDetail(scope.row, 'enter')"
             >录入诊断

src/views/tool/gen/index.vue

@@ -17,11 +17,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="创建时间">
+      <el-form-item label="创建日期">
         <el-date-picker
           v-model="dateRange"
           style="width: 240px"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy/MM/dd"
           type="daterange"
           range-separator="-"
           start-placeholder="开始日期"