diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 3778d5e..1cc79ce 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -149,7 +149,6 @@ $lighter-color: rgba(#4D6DE4, 0.5); } .small-btn{ - cursor: pointer; display: inline-block; width: 72px; height: 24px; @@ -159,7 +158,23 @@ $lighter-color: rgba(#4D6DE4, 0.5); color: #FFF; font-size: 12px; text-align: center; + cursor: pointer; &:hover{ background: $lighter-color; } +} +.delete-btn{ + cursor: pointer; + display: inline-block; + width: 72px; + height: 24px; + line-height: 24px; + background: #ff0000; + border-radius: 3px; + color: #FFF; + font-size: 12px; + text-align: center; + &:hover{ + background: (rgba(#ff0000, 0.5)); + } } \ No newline at end of file diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue index 67605b9..f5e398a 100644 --- a/src/components/SearchInput.vue +++ b/src/components/SearchInput.vue @@ -17,8 +17,8 @@ @click="changeInput" /> -
- +
+ diff --git a/src/components/charge/RecordsLog.vue b/src/components/charge/RecordsLog.vue index 9b7e714..a9dae16 100644 --- a/src/components/charge/RecordsLog.vue +++ b/src/components/charge/RecordsLog.vue @@ -6,9 +6,9 @@
@@ -31,17 +31,17 @@ const list = ref([]) const init = (patientId: any) => { const query = { patientId: patientId, - pageSize:10 + pageSize: 10 } post('charge/listDetail', {query}).then((res: any) => { list.value = res.list - console.log(list,'list') + console.log(list, 'list') }) } const clearList = () => { list.value = [] } -defineExpose({init,clearList}) +defineExpose({init, clearList}) \ No newline at end of file diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue index 47fad39..87e5640 100644 --- a/src/components/settings/SectionEdit.vue +++ b/src/components/settings/SectionEdit.vue @@ -115,9 +115,9 @@ @@ -196,6 +196,7 @@ const options = Object.entries(depts).map(([key, value]) => { } }); const init = (id: any) => { + form.value = {} post("organization/section/getById", {id}).then((res: any) => { form.value = res }) diff --git a/src/views/member/index.vue b/src/views/member/index.vue index 524753a..04bc93a 100644 --- a/src/views/member/index.vue +++ b/src/views/member/index.vue @@ -14,7 +14,7 @@
- 患者建档 + 患者建档
共{{ totalCount || 0 }}条
    @@ -52,10 +52,10 @@
    - 编辑资料 - 发放积分 - 兑换积分 - 查看流水 + 编辑资料 + 发放积分 + 兑换积分 + 查看流水
    diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue index beecbdb..9f7bf0e 100644 --- a/src/views/settings/log.vue +++ b/src/views/settings/log.vue @@ -13,9 +13,8 @@ /> - 查询 + 查询 -
    @@ -127,7 +126,11 @@ const handleDateChange = (date: any[]) => { border-top: 1px solid #ebeef5; display: flex; align-items: center; + justify-content: flex-end; } } - +:deep(.el-input__wrapper){ + height: 42px; + margin-right: 24px; +} \ No newline at end of file diff --git a/src/views/settings/print.vue b/src/views/settings/print.vue index 9d144eb..da2cb2e 100644 --- a/src/views/settings/print.vue +++ b/src/views/settings/print.vue @@ -14,7 +14,7 @@ - 保存 + 保存
    diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue index bcbc3c1..f3405f2 100644 --- a/src/views/settings/section.vue +++ b/src/views/settings/section.vue @@ -18,9 +18,9 @@
    - 查询 - 重置 - 新增 + 查询 + 重置 + 新增
    @@ -91,6 +91,7 @@ interface Dept { } const init = () => { + id.value='' post('organization/section/list', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => { tableData.value = res.list tableData.value.forEach((item: any) => { @@ -157,4 +158,7 @@ const resetSearch = () => { justify-content: flex-end; } } +:deep(.el-input__wrapper){ + height: 42px; +} \ No newline at end of file diff --git a/src/views/social/costRecord.vue b/src/views/social/costRecord.vue index 9ab2647..738f287 100644 --- a/src/views/social/costRecord.vue +++ b/src/views/social/costRecord.vue @@ -12,7 +12,7 @@ style="height: 100%" />
    - + diff --git a/src/views/social/directory.vue b/src/views/social/directory.vue index efddb54..5b1e6fa 100644 --- a/src/views/social/directory.vue +++ b/src/views/social/directory.vue @@ -84,7 +84,7 @@ {{ tip }}
    -
    @@ -103,7 +103,7 @@ />
    + > 开始更新
    @@ -184,6 +184,7 @@ let tableData: any = ref([]) let content: any = ref(null); const showBtn = ref(false) const percent = ref(0) +const percentage = ref(0) let update1312 = (current_page: number) => { showBtn.value = true if (current_page == 1) { @@ -197,7 +198,7 @@ let update1312 = (current_page: number) => { let number = res.number; if (current_page < pages && isUpdate1312.value) { current_page++ - percent.value = Math.floor((current_page / pages) * 100) + percent.value = Math.floor((current_page / pages) * 10000) tip.value = "开始更新第:" + current_page + "/" + pages; update1312(current_page); } else { @@ -339,7 +340,7 @@ const update1318 = (current_page: number) => { let number = res.number; if (current_page < pages && isUpdate1318.value) { current_page++ - percent.value = Math.floor((current_page / pages) * 100) + percent.value = Math.floor((current_page / pages) * 10000) tip.value = "开始更新第:" + current_page + "/" + pages; update1318(current_page); } else { @@ -361,7 +362,7 @@ const update1319 = (current_page: number) => { let number = res.number; if (current_page < pages && isUpdate1319.value) { current_page++ - percent.value = Math.floor((current_page / pages) * 100) + percent.value = Math.floor((current_page / pages) * 10000) tip.value = "开始更新第:" + current_page + "/" + pages; update1318(current_page); } else {