Merge remote-tracking branch 'origin/master'

src/assets/icons/svg/shuaixuan_icon_fanxiang.svg

+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12"><defs><style>.a{fill:none;}.b{isolation:isolate;clip-path:url(#a);}.c{fill:#333;}</style><clipPath id="a"><rect class="a" x="1" y="1" width="12" height="12"/></clipPath></defs><g class="b" transform="translate(-1 -1)"><path class="c" d="M175.909,220.487l3.792,3.686-.852.828-5.247-5.1,5.247-5.1.852.828-3.792,3.686H185.6v1.171Z" transform="translate(-172.602 -212.901)"/></g></svg>
\ No newline at end of file

src/components/ImageUpload/index.vue

@@ -224,7 +224,7 @@ export default {
       //   this.cropperVisible = true
       // })
 
-      this.fileName = file.name
+      this.fileName = file.name.replace(/[%;]/g, '')
     },
     // 点击剪裁弹框的确定按钮
     async onConfirm(blob) {

src/views/article-management/article-detail.vue

@@ -44,7 +44,7 @@
               <el-form-item label="文章封面" prop="articleCover">
                 <!--   0-- 文章信息的页面--文章封面 -->
                 <div class="base-msg">
-                  <div class="petPicture" style="padding-bottom: 20px;">
+                  <div class="petPicture" style="">
                     <ImagePreview :height="150" :src="baseURL+form.articleCover" :width="150" />
                   </div>
                 </div>
@@ -61,34 +61,20 @@
                       />
                     </el-select>
                   </div>
-                  <!--                  <div v-if="form.articleStatus==='0'" style="padding-top: 1px;">已上架</div>-->
-                  <!--                  <div v-else-if="form.articleStatus==='1'" style="padding-top: 1px;">已下架</div>-->
                 </div>
               </el-form-item>
+              <el-form-item label="文章内容" prop="articleCover">
+                <!--   0-- 文章信息的页面--文章封面 -->
+                <editor v-model="form.articleContent" read-only />
+              </el-form-item>
+              <el-form-item label="" prop="">
+                <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
+              </el-form-item>
             </el-form>
           </div>
-          <!--   2-- 文章信息--文章内容 -->
-          <div style="display: flex">
-            <!--  文章内容-->
-            <div class="tip-green" />
-            <div
-              class="title-font-style"
-            >文章内容
-            </div>
-          </div>
-          <!--   2-- 文章信息的页面--文章内容 -->
-          <div class="base-msg" style="padding-top: 32px; padding-bottom: 20px; padding-left: 13px;">
-            <el-row>
-              <div v-html="form.articleContent" />
-            </el-row>
-          </div>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button class="resetBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
         </div>
       </div>
     </el-card>
-
   </div>
 </template>
 
@@ -200,6 +186,7 @@ export default {
 .pet-owner-detail {
   //最外层嵌套卡片的样式
   .box-card {
+    min-height: calc(100vh - 100px);
   }
 
   //模块tip样式--绿色
@@ -232,7 +219,7 @@ export default {
 
   //1--基本信息--模块内信息整体样式
   .base-msg {
-    width: 500px;
+    width: 700px;
     //color: #666666;
     //display: grid !important;
     //grid-template-columns: repeat(3, auto);
@@ -273,4 +260,18 @@ export default {
   font-weight: bold;
   color: #333333;
 }
+::v-deep .ql-editor {
+  background-color: #f5f7fa;
+}
+::v-deep .ql-toolbar {
+  background-color: #f5f7fa;
+  .ql-formats {
+    button {
+      pointer-events: none !important;
+    }
+    .ql-picker {
+      pointer-events: none !important;
+    }
+  }
+}
 </style>

src/views/article-management/article-management.vue

@@ -70,22 +70,23 @@
             <!--反向选择-->
             <el-button
               v-hasPermi="['system:manage:export']"
-              class="fourWordsBtn"
-              icon="el-icon-back"
+              class="fourWordswhiteBtn"
               size="mini"
               @click="reverseSelect"
-            >反向选择
+            >
+              <svg-icon icon-class="shuaixuan_icon_fanxiang" />
+              反向选择
             </el-button>
             <!--批量导出-->
             <el-button
               v-hasPermi="['system:pets:export']"
-              class="fourWordsBtn"
+              class="fourWordswhiteBtn"
               size="mini"
               :loading="exportLoading"
               @click="handleExport"
             >
               <!-- 导入svg文件-->
-              <svg-icon icon-class="shaixuan_icon_daochu" />
+              <svg-icon icon-class="shaixuan_icon_daochu" style="font-size: 11px" />
               批量导出
             </el-button>
           </el-form-item>
@@ -155,13 +156,14 @@
               <div style="padding-right: 20px;">
                 <el-button
                   v-hasPermi="['business:article:edit']"
-                  icon="el-icon-edit"
                   plain
                   size="mini"
                   class="el-button--primary--solid"
                   type="primary"
                   @click="handleUpdate(scope.row)"
-                >编辑
+                >
+                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />
+                  编辑
                 </el-button>
               </div>
               <div v-if="scope.row.articleStatus==='1'">

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" />
@@ -117,14 +117,14 @@
               <div style="padding-right: 20px;">
                 <el-button
                   v-hasPermi="['business:banner:edit']"
-                  icon="el-icon-edit"
                   plain
                   size="mini"
                   class="el-button--primary--solid"
                   :disabled="scope.row.status === '1'"
                   type="primary"
                   @click="handleUpdate(scope.row)"
-                >编辑
+                >
+                  <svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;margin-right: 2px" />编辑
                 </el-button>
               </div>
               <div v-if="scope.row.status==='2'">

src/views/data-statistics/hospital-data-statistics/hospital-data-statistics.vue

@@ -136,7 +136,7 @@
                     />
                   </div>
                   <div class="prestoredRankFont">
-                    {{ item.total }}元
+                    {{ moneyFormat(item.total) }} 元
                   </div>
                 </div>
               </div>
@@ -855,4 +855,7 @@ export default {
 .progressWidth {
   width: 330px;
 }
+::v-deep .cell {
+  line-height: 2.125rem;
+}
 </style>

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

 <template>
   <div>
-    <div v-if="value >= 0" class="upPercentDiv">
-      +{{ value || 0 }}% <img src="../../../assets/data_statistics/caiwu_icon_sheng.png" height="12" width="8">
+    <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 }}% <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>
@@ -30,7 +30,7 @@ export default {
   font-size: 12px;
   font-family: Microsoft YaHei;
   font-weight: bold;
-  color: #5FB54B;
+  color: #DB4747;
   text-align: right;
 }
 .downPercentDiv {
@@ -38,7 +38,7 @@ export default {
   font-size: 12px;
   font-family: Microsoft YaHei;
   font-weight: bold;
-  color: #DB4747;
+  color: #5FB54B;
   text-align: right;
 }
 </style>

src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue

@@ -126,21 +126,19 @@
                 <div class="rank_hospital_name_font">
                   <overlong-tool :text="(item.ownerId || '-') + ' (' + item.nickname + ')'" :max="30" />
                 </div>
-                <el-row>
-                  <el-col :span="18">
-                    <el-progress
-                      :percentage="item.money/petOwnerConsumeRank[0].money*100"
-                      :stroke-width="9"
-                      :show-text="false"
-                      class="consumeRankProgress"
-                    />
-                  </el-col>
-                  <el-col :span="6">
+                <div style="display: flex">
+                    <div class="progressWidth">
+                      <el-progress
+                        :percentage="item.money/petOwnerConsumeRank[0].money*100"
+                        :stroke-width="9"
+                        :show-text="false"
+                        class="consumeRankProgress"
+                      />
+                    </div>
                     <div class="consumeRankFont">
-                      {{ item.money }}元
+                      {{ moneyFormat(item.money) }} 元
                     </div>
-                  </el-col>
-                </el-row>
+                </div>
               </div>
             </div>
             <empty-tool v-else title="宠主累计消费排行" />
@@ -434,7 +432,7 @@
                   <overlong-tool :text="item.ownerId + '（'+(item.nickname || '-')+'）'" :max="30" />
                 </div>
                 <el-row>
-                  <el-col :span="19">
+                  <el-col :span="16">
                     <el-progress
                       :percentage="item.money/vipTopUpRank[0].money*100"
                       :stroke-width="9"
@@ -442,9 +440,9 @@
                       class="consumeRankProgress"
                     />
                   </el-col>
-                  <el-col :span="5">
+                  <el-col :span="8">
                     <div class="consumeRankFont">
-                      {{ moneyFormat(item.money) }}元
+                      {{ moneyFormat(item.money) }} 元
                     </div>
                   </el-col>
                 </el-row>
@@ -662,8 +660,7 @@ export default {
         data: [],
         line_color: '#5FB54B',
         area_color: 'rgba(95,181,75,0.3)',
-        unit: '万元',
-        fixNum: 2
+        unit: '万元'
       },
       petOwnerConsumeRank: [],
       vipTopUpRank: [],
@@ -1217,4 +1214,10 @@ export default {
     height: 500px;
   }
 }
+.progressWidth {
+  width: 330px;
+}
+::v-deep .cell {
+  line-height: 2.125rem;
+}
 </style>

src/views/document-management/about-us/about-us.vue

@@ -79,17 +79,17 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        customClass: 'box-logout',
-        cancelButtonClass: 'resetBtn',
-        confirmButtonClass: 'queryBtn',
-        type: 'warning',
-        closeOnClickModal: false
-      }).then(() => {
-        this.$refs['ruleForm'].validate((valid) => {
-          if (valid) {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
+            type: 'warning',
+            closeOnClickModal: false
+          }).then(() => {
             if (this.isAdd) {
               // 新增
               addManagement(this.privacyPolicy).then(response => {
@@ -105,8 +105,8 @@ export default {
                 }
               })
             }
-          }
-        })
+          })
+        }
       })
     },
     getPrivacyPolicy() {

src/views/document-management/entry-contract/entry-contract.vue

@@ -35,7 +35,7 @@
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button style="color: #5FB54B" type="text" @click="check(scope.row)">查看</el-button>
+          <el-button style="color: #5FB54B" type="text" @click="check(scope.row, 1)">查看</el-button>
           <el-button style="color: #5FB54B" type="text" @click="downloadPdf(scope.row)">下载</el-button>
         </template>
       </el-table-column>
@@ -79,7 +79,7 @@
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button style="color: #5FB54B" type="text" @click="check(scope.row)">查看</el-button>
+          <el-button style="color: #5FB54B" type="text" @click="check(scope.row, 2)">查看</el-button>
           <el-button style="color: #5FB54B" type="text" @click="downloadPdf(scope.row)">下载</el-button>
         </template>
       </el-table-column>
@@ -94,7 +94,7 @@
     />
     <!-- 合同文件查看 -->
     <el-dialog
-      title="合同文件"
+      :title="title"
       :visible.sync="openContractDocument"
       :before-close="closeContractDocument"
       width="50%"
@@ -141,7 +141,8 @@ export default {
         pageSize: 20,
         hospitalId: null
       },
-      id: null
+      id: null,
+      title: ''
     }
   },
   mounted() {
@@ -190,7 +191,12 @@ export default {
         console.log('医院ID', this.currentHospitalId)
       })
     },
-    check(row) {
+    check(row, num) {
+      if (num === 1) {
+        this.title = '入驻合同'
+      } else if (num === 2) {
+        this.title = '授权合同'
+      }
       this.openContractDocument = true
       this.contractDocumentUrl = this.baseUrl + row.contract
     },

src/views/document-management/privacy-policy/privacy-policy.vue

@@ -79,17 +79,17 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        customClass: 'box-logout',
-        cancelButtonClass: 'resetBtn',
-        confirmButtonClass: 'queryBtn',
-        type: 'warning',
-        closeOnClickModal: false
-      }).then(() => {
-        this.$refs['ruleForm'].validate((valid) => {
-          if (valid) {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
+            type: 'warning',
+            closeOnClickModal: false
+          }).then(() => {
             if (this.isAdd) {
               // 新增
               addManagement(this.privacyPolicy).then(response => {
@@ -105,8 +105,8 @@ export default {
                 }
               })
             }
-          }
-        })
+          })
+        }
       })
     },
     getPrivacyPolicy() {

src/views/document-management/user-protocol/user-protocol.vue

@@ -79,17 +79,17 @@ export default {
       //   this.$modal.msgError('内容不能为空')
       //   return
       // }
-      this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        customClass: 'box-logout',
-        cancelButtonClass: 'resetBtn',
-        confirmButtonClass: 'queryBtn',
-        type: 'warning',
-        closeOnClickModal: false
-      }).then(() => {
-        this.$refs['ruleForm'].validate((valid) => {
-          if (valid) {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          this.$confirm('系统将立即发布编辑内容,是否确定', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            customClass: 'box-logout',
+            cancelButtonClass: 'resetBtn',
+            confirmButtonClass: 'queryBtn',
+            type: 'warning',
+            closeOnClickModal: false
+          }).then(() => {
             if (this.isAdd) {
               // 新增
               addManagement(this.privacyPolicy).then(response => {
@@ -105,8 +105,8 @@ export default {
                 }
               })
             }
-          }
-        })
+          })
+        }
       })
     },
     getPrivacyPolicy() {

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
@@ -1159,7 +1170,7 @@ color: #333333;"
                   >保存
                   </el-button>
                   <el-button
-                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && (scope.row.status === '1' || scope.row.status === '2')"
+                    v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow && ( scope.row.status === '0' || scope.row.status === '1' )"
                     id="remove-hospitalized"
                     icon="el-icon-document"
                     plain
@@ -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/medical-record-management/check-item.vue

@@ -154,13 +154,14 @@
                 :prop="'settingList.'+index+'.sort'"
                 :rules="[
                   { required: true, message: '请输入权重', trigger: 'change' },
-                  { validator: validateSort, trigger: 'change, blur' }
+                  { validator: validateSort(item), trigger: 'change, blur' }
                 ]"
               >
                 <el-input-number
                   v-model="item.sort"
                   :min="0"
                   :max="9999"
+                  :disabled="item.itemType === '2'"
                   controls-position="right"
                   style="width: 100%;"
                   @keydown.native="handleKeyDownSort"
@@ -282,7 +283,9 @@ export default {
         { value: '0', label: '否' }
       ],
       fullscreenLoading: false,
-      isPlatRole: false
+      isPlatRole: false,
+      // 临时数组(用于预约外部服务, 权重为0)
+      temporaryArray: []
     }
   },
   created() {
@@ -320,6 +323,11 @@ export default {
           console.log('检查项目列表', response)
           if (response.rows.length > 0) {
             this.form.settingList = response.rows
+            console.log('临时对象', this.temporaryArray)
+            this.form.settingList.forEach(item => {
+              item.sort = item.itemType === '0' ? item.sort : 0
+            })
+            console.log('dddd', this.form.settingList)
           } else {
             this.form.settingList = [{
               name: '',
@@ -366,12 +374,14 @@ export default {
       }
     },
     /** 权重校验 */
-    validateSort: function(rule, value, callback) {
-      console.log('value', value)
-      if (value === 0) {
-        callback(new Error('权重不能为0'))
-      } else {
-        callback()
+    validateSort(item) {
+      return (rule, value, callback) => {
+        console.log('value', value)
+        if (value === 0 && item.itemType !== '2') {
+          callback(new Error('权重不能为0'))
+        } else {
+          callback()
+        }
       }
     },
     /** 将阿拉伯数字转成汉字（如:1变成一）*/

src/views/service-management/medical-record-management/check-subscribe.vue

@@ -362,6 +362,7 @@ export default {
         this.subscribeMessage = response.data
         this.subscribeMessage.payAmount = this.keepTwoDecimals(this.subscribeMessage.payAmount)
         // 时间
+        this.subscribeMessage.amountPaid = moneyFormat(this.subscribeMessage.amountPaid)
         this.deviceQueryParams.reservationTime = parseTime(new Date(), '{y}-{m}-{d}')
         // 服务类型(医院自有、外部服务)
         if (this.subscribeMessage.checkType === '0') {

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

@@ -82,10 +82,11 @@
       <el-button
         v-hasPermi="['business:check:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-finished"
         size="mini"
         @click="selectAll()"
-      >选择全部
+      >
+        <svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
+        选择全部
       </el-button>
       <el-button
         v-hasPermi="['business:check:export']"
@@ -98,10 +99,11 @@
       <el-button
         v-hasPermi="['business:check:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-upload2"
         size="mini"
         @click="handleExport()"
-      >批量导出
+      >
+        <svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />
+        批量导出
       </el-button>
       <el-button
         v-hasPermi="['business:check:item']"
@@ -346,7 +348,7 @@
           <el-table-column prop="num" align="left" label="剩余可预约" />
           <el-table-column v-if="currentCheckType === '2'" prop="price" align="left" label="设备服务费">
             <template slot-scope="scope">
-              <span>{{ scope.row.price || '-' }}</span>
+              <span>{{ moneyFormat(scope.row.price) + ' 元' }}</span>
             </template>
           </el-table-column>
           <el-table-column align="left" label="操作">
@@ -356,8 +358,9 @@
                 class="el-button--success--solid--four"
                 size="mini"
                 type="success"
+                style="width: 84px !important; height: 24px;"
                 plain
-                :disabled="parseInt(currentPayAmount) > parseInt(currentHospital.currentBalance)"
+                :disabled="parseInt(scope.row.price) > parseInt(currentHospital.currentBalance)"
                 @click="handleSubscribeDevice(scope.row)"
               >立即预约
               </el-button>
@@ -366,6 +369,7 @@
                 size="mini"
                 type="success"
                 class="el-button--success--solid--four"
+                style="width: 84px !important; height: 24px;"
                 plain
                 @click="handleSubscribeDevice(scope.row)"
               >立即预约
@@ -512,8 +516,6 @@ export default {
       selectableDevice: [],
       // 当前的检查ID
       currentCheckId: null,
-      // 当前的设备服务费
-      currentPayAmount: null,
       // 检查类型(0-自有、2-外部)
       currentCheckType: null,
       updateRow: {},
@@ -568,7 +570,7 @@ export default {
     getList() {
       this.loading = true
       if (this.queryParams.orderByColumn === null) {
-        this.queryParams.orderByColumn = 'c.check_start_time'
+        this.queryParams.orderByColumn = 'c.create_time'
         this.queryParams.isAsc = 'desc'
       }
       console.log('检查筛选条件', this.queryParams)
@@ -744,12 +746,6 @@ export default {
       this.deviceQueryParams.checkTypeList = [...new Set(this.deviceQueryParams.checkTypeList)]
       this.deviceQueryParams.reservationTime = this.getCurrentTime()
       this.currentCheckId = row.id
-      if (row.checkType === '2') {
-        this.currentPayAmount = row.devicePrice
-        this.updateRow = row
-      } else {
-        this.currentPayAmount = row.payAmount
-      }
       this.currentCheckType = row.checkType
       console.log('点击立即预约后的状态', this.deviceQueryParams)
       // 设置检查项目id
@@ -786,7 +782,7 @@ export default {
         checkMessage.checkStartTime = row.checkDate + ' ' + checkTimeList[0]
         checkMessage.checkEndTime = row.checkDate + ' ' + checkTimeList[1]
         checkMessage.checkSchedule = '2' // 把进度改为预约检查
-        checkMessage.devicePrice = this.currentPayAmount
+        checkMessage.devicePrice = row.price
         if (this.updateRow.checkType === '2') {
           checkMessage.payAmount = this.updateRow.payAmount
         }
@@ -808,11 +804,6 @@ export default {
         console.log('设备', res)
         this.deviceList = res.rows.table
         this.deviceTotal = res.total
-        if (this.currentCheckType === '2' && this.deviceList.length > 0) {
-          this.deviceList.forEach(item => {
-            item['price'] = this.keepTwoDecimals(this.currentPayAmount) + ' 元'
-          })
-        }
       })
     },
     /** 重置按钮操作 */

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">
@@ -288,7 +287,7 @@
         <!--        住院模块--后续开发 -->
         <el-row class="hospital-content">
           <div>
-            <el-form-item label="住院治疗">
+            <el-form-item label="住院治疗" prop="diseaseLevel" :rules="[{required: !!prescribingForm.bathe, message: '请选择住院治疗', trigger: 'change'}]">
               <el-select
                 v-model="prescribingForm.diseaseLevel"
                 clearable
@@ -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,14 +787,18 @@ export default {
           console.log('我就是为了看预约挂号传值!!!!', temp)
           submitPrescribing(temp).then(res => {
             console.log('看见了吗!!!!', res)
-            if (res.code === 204) {
-              this.$notify.error({
-                title: '错误',
-                message: '当日ICU病房已满'
-              })
-            }
+            // 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')
           })
         }
       })

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

@@ -53,9 +53,10 @@
       <el-button
         v-hasPermi="['business:manage:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-finished"
         @click="selectAll()"
-      >选择全部
+      >
+        <svg-icon style="margin-right: 5px" icon-class="shuaixuan_icon_quanbu" />
+        选择全部
       </el-button>
       <el-button
         v-hasPermi="['business:manage:export']"
@@ -68,10 +69,11 @@
       <el-button
         v-hasPermi="['business:manage:export']"
         class="fourWordswhiteBtn"
-        icon="el-icon-upload2"
         size="mini"
         @click="handleExport"
-      >批量导出
+      >
+        <svg-icon style="margin-right: 5px" icon-class="shaixuan_icon_daochu" />
+        批量导出
       </el-button>
       <el-button
         v-hasPermi="['business:treat:item']"
@@ -105,7 +107,7 @@
       :data="treatmentList"
       :row-key="getRowKeys"
       :header-cell-class-name="cellClass"
-      :header-cell-style="{ background:'#E8E9E8' }"
+      :header-cell-style="{ background:'#F4F4F4' }"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" min-width="47" align="center" :reserve-selection="true" />
@@ -582,6 +584,7 @@ export default {
     this.getList()
     this.getUserNameList()
     this.getCurrentUser()
+    this.getAppointmentRecord()
   },
   methods: {
     // 获取当前登陆用户
@@ -780,7 +783,7 @@ export default {
     getList() {
       this.loading = true
       if (this.queryParams.orderByColumn === null) {
-        this.queryParams.orderByColumn = 'treatStartTime'
+        this.queryParams.orderByColumn = 'c.create_time'
         this.queryParams.isAsc = 'desc'
       }
       selectTreatListP(this.queryParams).then(res => {