Merge remote-tracking branch 'origin/master'

src/assets/styles/btn.scss

@@ -114,6 +114,11 @@
     border: 1px solid #5BB647!important;
     color: #FFFFFF!important;
   }
+  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+    background: #83C374!important;
+    color: #FFFFFF!important;
+    border: 1px solid #83C374!important;
+  }
 }
 // 四个字白色按钮
 .fourWordswhiteBtn{
@@ -192,6 +197,11 @@
     color: #FFFFFF!important;
     border: 1px solid #55A343!important;
   }
+  &.is-disabled,&.is-disabled:hover,&.is-disabled:focus,&.permi-disabled,&.permi-disabled:hover,&.permi-disabled:focus{
+    background: #83C374!important;
+    color: #FFFFFF!important;
+    border: 1px solid #83C374!important;
+  }
 }
 /** 删除按钮(四个字的删除)样式*/
 .delBtn{
@@ -276,13 +286,12 @@
 }
 
 /** 权限重写，所未勾选权限按钮的悬浮状态 */
-.permi-disabled {
+.el-button.is-disabled,.el-button.is-disabled:hover,.el-button.is-disabled:focus,.el-button.permi-disabled,.el-button.permi-disabled:hover,.el-button.permi-disabled:focus {
   cursor: not-allowed;
   background: rgba(201,201,201,0.08)!important;
   border: 1px solid #C9C9C9!important;
   opacity: 1;
   border-radius: 4px!important;
-  font-size: 12px;
   font-family: Microsoft YaHei;
   font-weight: 400;
   color: #C9C9C9!important;

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

@@ -160,7 +160,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateArticle(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

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

@@ -194,7 +194,7 @@ export default {
     //         updateArticle(this.form).then(response => {
     //           this.$message({
     //             type: 'success',
-    //             message: '修改成功!'
+    //             message: '编辑成功!'
     //           })
     //           this.goBack()
     //         })
@@ -211,7 +211,7 @@ export default {
     //     if (valid) {
     //       if (this.form.id != null) {
     //         updateArticle(this.form).then(response => {
-    //           this.$modal.msgSuccess('修改成功')
+    //           this.$modal.msgSuccess('编辑成功')
     //           this.open = false
     //           this.getList()
     //         })

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

@@ -477,7 +477,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateArticle(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

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

@@ -1157,7 +1157,7 @@ export default {
 
           }).then(() => {
             updateDevice(form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.cancel()
               console.log('this.form)', form)
             })

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

@@ -431,7 +431,6 @@ color: #333333;"
               <el-form-item label="诊断结果" prop="diagnosisResult">
                 <el-input
                   v-model.trim="detailInfo.diagnosisResult"
-                  show-word-limit
                   :disabled="!isEdit"
                   maxlength="20"
                   :placeholder="isEdit? '请输入诊断结果' : '-'"
@@ -1211,9 +1210,9 @@ color: #333333;"
         style="width: 100%; height: 60vh"
         scrolling="auto"
       />
-      <div slot="footer" class="dialog-footer">
-        <el-button class="queryBtn" @click="closeReportModle">确 定</el-button>
-      </div>
+<!--      <div slot="footer" class="dialog-footer">-->
+<!--        <el-button class="queryBtn" @click="closeReportModle">确 定</el-button>-->
+<!--      </div>-->
     </el-dialog>
   </div>
 </template>
@@ -1626,7 +1625,7 @@ export default {
             editRecord(temp).then(res => {
               this.$message({
                 type: 'success',
-                message: '修改成功'
+                message: '编辑成功'
               })
               console.log('editRecord', res)
               this.$router.push('/medical-record-management/index')

src/views/monitor/job/index.vue

@@ -487,7 +487,7 @@ export default {
         if (valid) {
           if (this.form.jobId !== undefined) {
             updateJob(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/role-permission/role-management/role-management.vue

@@ -565,7 +565,7 @@ export default {
           if (this.form.roleId !== undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             updateRole(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })
@@ -585,7 +585,7 @@ export default {
       if (this.form.roleId !== undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
         dataScope(this.form).then(response => {
-          this.$modal.msgSuccess('修改成功')
+          this.$modal.msgSuccess('编辑成功')
           this.openDataScope = false
           this.getList()
         })

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

@@ -338,12 +338,20 @@
           <el-table-column align="left" label="操作">
             <template slot-scope="scope">
               <el-button
+                v-if="deviceQueryParams.isPrivate === '0'"
                 style="color: #5FB54B"
                 type="text"
                 @click="handleSubscribeDevice(scope.row)"
                 :disabled="parseInt(currentPayAmount) > parseInt(currentHospital.currentBalance)"
               >立即预约
               </el-button>
+              <el-button
+                v-else
+                style="color: #5FB54B"
+                type="text"
+                @click="handleSubscribeDevice(scope.row)"
+              >立即预约
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -810,7 +818,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             updateManage(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

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

@@ -116,8 +116,8 @@
       @pagination="getList"
     />
     <div slot="footer" class="dialog-footer">
-      <el-button class="queryBtn" @click="choosePet">确 定</el-button>
       <el-button class="resetBtn" @click="closeModle">取 消</el-button>
+      <el-button class="queryBtn" @click="choosePet">确 定</el-button>
     </div>
   </el-dialog>
 </template>
@@ -239,7 +239,7 @@ export default {
       this.queryParams = {
         // 导出列表
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 6,
         petCode: '',
         ownerName: '',
         phone: '',
@@ -267,7 +267,7 @@ export default {
       this.queryParams = {
         // 导出列表
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 6,
         petCode: '',
         ownerName: '',
         phone: '',

src/views/system/config/index.vue

@@ -302,7 +302,7 @@ export default {
         if (valid) {
           if (this.form.configId !== undefined) {
             updateConfig(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/dept/index.vue

@@ -312,7 +312,7 @@ export default {
         if (valid) {
           if (this.form.deptId !== undefined) {
             updateDept(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/dict/data.vue

@@ -365,7 +365,7 @@ export default {
           if (this.form.dictCode !== undefined) {
             updateData(this.form).then(response => {
               this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/dict/index.vue

@@ -305,7 +305,7 @@ export default {
         if (valid) {
           if (this.form.dictId !== undefined) {
             updateType(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/menu/index.vue

@@ -424,7 +424,7 @@ export default {
         if (valid) {
           if (this.form.menuId !== undefined) {
             updateMenu(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/notice/index.vue

@@ -283,7 +283,7 @@ export default {
         if (valid) {
           if (this.form.noticeId !== undefined) {
             updateNotice(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/post/index.vue

@@ -274,7 +274,7 @@ export default {
         if (valid) {
           if (this.form.postId !== undefined) {
             updatePost(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/role/index.vue

@@ -565,7 +565,7 @@ export default {
           if (this.form.roleId !== undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             updateRole(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })
@@ -585,7 +585,7 @@ export default {
       if (this.form.roleId !== undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
         dataScope(this.form).then(response => {
-          this.$modal.msgSuccess('修改成功')
+          this.$modal.msgSuccess('编辑成功')
           this.openDataScope = false
           this.getList()
         })

src/views/system/user/index.vue

@@ -600,7 +600,7 @@ export default {
         inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
       }).then(({ value }) => {
         resetUserPwd(row.userId, value).then(response => {
-          this.$modal.msgSuccess('修改成功，新密码是：' + value)
+          this.$modal.msgSuccess('编辑成功，新密码是：' + value)
         })
       }).catch(() => {})
     },
@@ -615,7 +615,7 @@ export default {
         if (valid) {
           if (this.form.userId !== undefined) {
             updateUser(this.form).then(response => {
-              this.$modal.msgSuccess('修改成功')
+              this.$modal.msgSuccess('编辑成功')
               this.open = false
               this.getList()
             })

src/views/system/user/profile/hospitalInfo.vue

@@ -52,7 +52,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           updateHospital(this.hospital).then(res => {
-            this.$modal.msgSuccess('修改成功')
+            this.$modal.msgSuccess('编辑成功')
           })
         }
       })

src/views/system/user/profile/resetPwd.vue

@@ -55,7 +55,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess('修改成功')
+            this.$modal.msgSuccess('编辑成功')
           })
         }
       })

src/views/system/user/profile/userAvatar.vue

@@ -142,7 +142,7 @@ export default {
         //   this.open = false;
         //   this.options.img = process.env.VUE_APP_BASE_API + response.imgUrl;
         //   store.commit('SET_AVATAR', this.options.img);
-        //   this.$modal.msgSuccess("修改成功");
+        //   this.$modal.msgSuccess("编辑成功");
         //   this.visible = false;
         // });
       })

src/views/system/user/profile/userInfo.vue

@@ -62,7 +62,7 @@ export default {
       this.$refs['form'].validate(valid => {
         if (valid) {
           updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess('修改成功')
+            this.$modal.msgSuccess('编辑成功')
           })
         }
       })