Merge remote-tracking branch 'origin/master'

.env.development

@@ -8,7 +8,7 @@ ENV = 'development'
 VUE_APP_BASE_API = '/dev-api'
 
 # 图片显示
-VUE_APP_TEST_API = 'http://127.0.0.1:8090'
+VUE_APP_TEST_API = 'http://127.0.0.1:9000'
 
 # A端前端地址
 VUE_APP_WEB = 'http://localhost:80'

.env.edit

@@ -11,7 +11,7 @@ NODE_ENV= 'production'
 VUE_APP_BASE_API = 'http://114.67.241.140:8091'
 
 # 图片显示
-VUE_APP_TEST_API = 'http://114.67.241.140:8090'
+VUE_APP_TEST_API = 'http://114.67.241.140:9000'
 
 # A端前端地址
 VUE_APP_WEB = 'http://114.67.241.140:80'

.env.production

@@ -9,7 +9,7 @@ ENV = 'production'
 VUE_APP_BASE_API = 'http://47.92.195.144:8091'
 
 # 图片显示
-VUE_APP_TEST_API = 'http://47.92.195.144:8090'
+VUE_APP_TEST_API = 'http://47.92.195.144:9000'
 
 # A端前端地址
 VUE_APP_WEB = 'http://47.92.195.144:80'

.env.test

@@ -11,7 +11,7 @@ NODE_ENV= 'production'
 VUE_APP_BASE_API = 'http://47.92.55.88:8091'
 
 # 图片显示
-VUE_APP_TEST_API = 'http://47.92.55.88:8090'
+VUE_APP_TEST_API = 'http://47.92.55.88:9000'
 
 # A端前端地址
 VUE_APP_WEB = 'http://47.92.55.88:80'

src/assets/styles/btn.scss

@@ -314,6 +314,11 @@
   border-radius: 6px 6px 6px 6px;
   border: 1px solid rgb(219, 71, 71)!important;
 }
+.el-button--disabled--solid--four{
+  width: 80px!important;
+  border-radius: 6px 6px 6px 6px;
+  border: 1px solid  rgba(201,201,201)!important;
+}
 .icon-list{
   font-size: 11px;
   margin-right: 2px;

src/views/equipment-management/equipment-management/equipment-add.vue

@@ -14,7 +14,7 @@
             <el-row>
               <el-col :span="8">
                 <el-form-item label="设备名称" prop="deviceName">
-                  <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" class="inputWidth" maxlength="20"/>
+                  <el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" class="inputWidth" maxlength="20" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -266,6 +266,7 @@
                     size="large"
                     :options="areaOptions"
                     :props="props"
+                    disabled="serviceAreaShow"
                     placeholder="请选择支持服务地区"
                     collapse-tags
                     expand-trigger="hover"
@@ -447,25 +448,14 @@ export default {
       //   label: '待定'
       // }
       ],
-      // 城市
-      citys: regionData,
-      // 支持服务地区
-      serviceAreaS: [],
 
-      // serviceArea: '',
+      serviceAreaShow: false,
       // 是否显示
       isShow: '',
       hpshow: '',
       // 查询检查项目下拉框传递的字段
       itemType: '',
 
-      // // 可用时段
-      // useTime: {
-      //   ams: null,
-      //   ame: null,
-      //   pms: null,
-      //   pme: null
-      // },
       // 表单参数
       form: {
         deviceName: '',
@@ -525,6 +515,12 @@ export default {
           this.hpshow = true
           this.isPrivate = 1
           this.itemType = 0
+          signHospitalMessage().then(response => {
+            console.log('查到医院信息', response)
+            this.form.serviceArea = response.data.addressCode
+            this.serviceAreaShow = true
+            console.log('查到医院地址', this.form.serviceArea)
+          })
         }
         if (this.userType === '00') {
           this.isShow = true

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

@@ -1799,7 +1799,7 @@ export default {
           deleteTreat(rowData.id).then(() => {
             this.$message({
               type: 'success',
-              message: '删除成功!'
+              message: '删除成功'
             })
             this.getDetail('update')
           })
@@ -1807,7 +1807,7 @@ export default {
           deleteDrug(rowData.id).then(() => {
             this.$message({
               type: 'success',
-              message: '删除成功!'
+              message: '删除成功'
             })
             this.getDetail('update')
           })

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

@@ -442,12 +442,28 @@ export default {
     },
     // 表格当前手动勾选的
     selectChange(selection, row) {
-      console.log('selectChange', selection, '22234455555555555555555555555', row)
+      // 选中行是没有则将当前list里面的数据从ids里情况
+      if (selection.length === 0) {
+        const temp = this.recordList.map(item => {
+          return item.id
+        })
+        this.ids = this.ids.filter(item => {
+          return !temp.includes(item)
+        })
+      } else {
+        // 遍历当前页选中行如果没有的就加上
         selection.forEach(item => {
           if (!this.ids.some(idItem => idItem === item.id)) {
             this.ids.push(item.id)
           }
         })
+        // 判断选中行是不是被勾掉了
+        if (row && !selection.some(item => item.id === row.id)) {
+          this.ids = this.ids.filter(item => {
+            return item !== row.id
+          })
+        }
+      }
     },
 
     /** 功能按钮--导出按钮操作 */
@@ -459,9 +475,10 @@ export default {
         console.log('this.ids' + this.ids)
         this.download('business/record/export', exportList, `病历管理-${this.exportFormatTime(new Date())}.xlsx`).then(res => {
           this.$refs.table.clearSelection()
+          this.ids = []
         })
       } else {
-        this.$modal.msgError('请选择至少一条数据导出')
+        this.$modal.msgWarning('请选择至少一条数据导出')
         return
       }
     },
@@ -492,7 +509,7 @@ export default {
     /** 查询病例管理列表 */
     getList() {
       this.loading = true
-      this.queryParams.doctorIdList = this.doctorIdList.join(',')
+      this.queryParams.doctorId = this.doctorIdList.join(',')
       if (this.deptLevel === '2') {
         this.queryParams.hospitalName = this.showHospitalName
       }
@@ -567,6 +584,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {
+        doctorId: null,
         orderByColumn: null,
         isAsc: null,
         // 排序方式声明
@@ -590,7 +608,6 @@ export default {
         medicationInformation: null,
         petId: null,
         petOwnerId: null,
-        doctorId: null,
         petJson: null,
         doctorJson: null,
         ownerJson: null,

src/views/service-management/hospitalization-management/components/assign-wards.vue

 <template>
   <el-dialog
     :close-on-click-modal="false"
-    title="详情"
+    title="变更病房"
     :visible.sync="isShow"
     :before-close="closeModle"
     width="70%"
@@ -111,7 +111,7 @@
     </div>
     <!--分页-->
     <pagination
-      v-show="total>0"
+      v-show="total>10"
       :limit.sync="queryParams.pageSize"
       :page.sync="queryParams.pageNum"
       :total="total"
@@ -119,7 +119,7 @@
       @pagination="getWardList()"
     />
 
-    <div style="padding: 20px">
+    <div style="padding: 20px;text-align: right;">
       <el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
       <el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
     </div>

src/views/service-management/hospitalization-management/components/handle-discharge.vue

@@ -54,7 +54,7 @@
       </el-form>
     </div>
 
-    <div style="padding: 20px">
+    <div style="padding: 20px;text-align: right;">
       <el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
       <el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
     </div>

src/views/service-management/hospitalization-management/components/handling-admissions.vue

@@ -131,7 +131,7 @@
       @pagination="getWardList()"
     />
 
-    <div style="padding-left: 20px;padding-top: 20px;">
+    <div style="padding-left: 20px;padding-top: 20px;text-align: right;">
       <el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
       <el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
     </div>

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

@@ -369,7 +369,7 @@
             <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;"
-            >押金充值信息
+            >押金信息
             </div>
           </div>
 

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

@@ -219,8 +219,7 @@
             icon="el-icon-paperclip"
             plain
             size="mini"
-            class="el-button--warning--solid--four"
-            type="warning"
+            class="el-button--disabled--solid--four"
             :disabled="true"
           >办理入院</el-button>
           <el-button

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

@@ -356,6 +356,7 @@ export default {
           color: #AFAFAF;
           line-height: 19px;
           height: 32px;
+          margin-bottom: 15px;
         }
       }
 

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

@@ -376,7 +376,7 @@
                         clearable
                         disabled
                         type="date"
-                        placeholder="暂无数据"
+                        placeholder="-"
                         value-format="yyyy-MM-dd"
                         format="yyyy/MM/dd HH:mm:ss"
                       />
@@ -413,7 +413,7 @@
                     <el-form ref="visitForm" class="register-detail__form" :model="visitForm" label-width="81px" size="small">
                       <el-col :span="8" class="form__left">
                         <el-form-item label="病历号">
-                          <el-input v-model="detailInfo.medicalRecordNo" placeholder="暂无数据" disabled />
+                          <el-input v-model="detailInfo.medicalRecordNo" placeholder="-" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="8">