From e6172225c60858c74c4ab9cc60c302c653b707cc Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Fri, 2 Jun 2023 17:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD=E7=BB=84=E4=BB=B6=E5=B0=81?= =?UTF-8?q?=E8=A3=85,=E5=A5=97=E9=A4=90=EF=BC=8C=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 4 +- src/components/compTable.vue | 26 +- src/components/publicjs/public.js | 72 +++ src/router/index.js | 16 +- src/views/Home.vue | 164 +++++-- .../basic-dictionary/MedicalConclusion.vue | 152 +++++-- src/views/fee-settings/ItemResultMatch.vue | 421 +++++++++++++++++ src/views/fee-settings/ItemResultTemplate.vue | 428 +++++++++++++++++- src/views/fee-settings/ItemTemplate.vue | 383 ++++++++++++++++ src/views/fee-settings/MedicalPackage.vue | 414 +++++++++++++++++ 10 files changed, 1990 insertions(+), 90 deletions(-) create mode 100644 src/components/publicjs/public.js create mode 100644 src/views/fee-settings/ItemResultMatch.vue create mode 100644 src/views/fee-settings/ItemTemplate.vue create mode 100644 src/views/fee-settings/MedicalPackage.vue diff --git a/src/api/api.js b/src/api/api.js index a892177..1924057 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -89,13 +89,13 @@ instance.interceptors.response.use( //你真是一个大聪明 response、reques if (res.data.code == 1) { const { data } = res; return data - } else if (res.data.code == -1) { + } else if (res.code == -1) { // console.log(res.data.message); // this.$message({ // message: res.data.message, // type: 'warning' // }); - Message.error(res.data.message); + Message.error(res.message); } // const { data } = res; diff --git a/src/components/compTable.vue b/src/components/compTable.vue index b0b0c80..3b03131 100644 --- a/src/components/compTable.vue +++ b/src/components/compTable.vue @@ -10,10 +10,9 @@ 'font-size': '16px', color: '#8590a6', }" - ref="multipleTable" - @sort-change="handleSort" + highlight-current-row @filter-change="filterHandler" @row-click="handleRowClick" > @@ -29,7 +28,6 @@ :filtered-value="th.filteredValue" :filter-multiple="th.filterMultiple" :min-width="th.minWidth" - > + @@ -97,7 +105,15 @@ export default { }, // 某一行被点击 handleRowClick(row) { - this.$emit("click-events", row); + // 点击选中是的颜色改变我给你看文档吧? 你这不是可以是的但是那个我用封装的就不行那边那个 + // 你封装的那个js文件在哪里没有JS就是封装成组件调用 + // 你现在是哪里不行 现在效果不是出来了?是的row可以传递过去拿的到你点击列表看看 + // 你看我点击了哪个row那边传过去了 然后呢就选中效果没显示这一个问题背景没变 + + this.$refs.multipleTable.setCurrentRow(row); + // multipleTable. + console.log("row", row); + this.$emit("clickevents", row); }, }, }; diff --git a/src/components/publicjs/public.js b/src/components/publicjs/public.js new file mode 100644 index 0000000..480e61c --- /dev/null +++ b/src/components/publicjs/public.js @@ -0,0 +1,72 @@ +import Sortable from "sortablejs"; +import { putapi } from "@/api/api"; +//拖拽组件初始化 +function rowDrop(aa, tableData, isshow, cb) { + const tbody = document.querySelector(aa);//".el-table__body-wrapper tbody" + console.log('tableDatatableData', tableData, isshow, this) + Sortable.create(tbody, { + handle: ".move", + animation: 300, + onEnd({ newIndex, oldIndex }) { + cb() + const currRow = tableData.splice(oldIndex, 1)[0]; + tableData.splice(newIndex, 0, currRow); + tableData.map((item, index) => { + if (index == newIndex && index == oldIndex) { + // console.log(item, "新数据"); + } else if (index == oldIndex) { + } else if (index == newIndex) { + } + }); + console.log(tableData); + console.log(tableData.map((item) => item.displayOrder)); + }, + }); +} + +//拖拽排序确定方法 +//确定拖拽 +// function aassertion() { +// const result = []; +// this.tableData.forEach((item, index) => { +// // index 从0开始的， displayOrder从大到小排 +// console.log(item.id); +// console.log(index); +// // const currentDisplayOrder = this.tableData.length -1 +// const currentDisplayOrder = this.initTableData[index].displayOrder; +// if (item.displayOrder != currentDisplayOrder) { +// // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置 +// result.push({ id: item.id, displayOrder: currentDisplayOrder }); +// } +// }); +// conlusiondraganddrop({ itemList: result }).then((res) => { +// this.$message.success("操作成功"); +// this.isshow = true; +// this.getlist(); +// }); +// } +function assertions(tableData, initTableData) { + const result = []; + tableData.forEach((item, index) => { + // index 从0开始的， displayOrder从大到小排 + console.log(item.id); + console.log(index); + // const currentDisplayOrder = this.tableData.length -1 + const currentDisplayOrder =initTableData[index].displayOrder; + if (item.displayOrder != currentDisplayOrder) { + // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置 + result.push({ id: item.id, displayOrder: currentDisplayOrder }); + } + console.log('currentDisplayOrder',currentDisplayOrder); + console.log('item',item); + }); + // putapi(url, { itemList: result }).then((res) => { + // this.$message.success("操作成功"); + // this.isshow = true; + // this.getlist(); + // }); +} +export { + rowDrop, + assertions +} \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 7eccd3b..9af54ed 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -58,7 +58,7 @@ const routes = [ { path: '/nation', component: () => import('../views/basic-dictionary/Nation.vue') - }, + }, { path: '/birth-place', component: () => import('../views/basic-dictionary/BirthPlace.vue') @@ -124,7 +124,7 @@ const routes = [ component: () => import('../views/basic-dictionary/DiagnosisLevel.vue') }, { - path: '/invoice-item-type', + path: '/invoice-item-type', component: () => import('../views/fee-settings/InvoiceItemType.vue') }, { @@ -159,6 +159,18 @@ const routes = [ path: '/item-result-template', component: () => import('../views/fee-settings/ItemResultTemplate.vue') }, + { + path: '/item-result-match', + component: () => import('../views/fee-settings/ItemResultMatch.vue') + }, + { + path: '/item-template', + component: () => import('../views/fee-settings/ItemTemplate.vue') + }, + { + path: '/medical-package', + component: () => import('../views/fee-settings/MedicalPackage.vue') + }, ] }, ]; diff --git a/src/views/Home.vue b/src/views/Home.vue index e267140..61dafad 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -12,7 +12,9 @@ 操作 - 退出登录 + 退出登录 修改密码 螺蛳粉 @@ -23,9 +25,19 @@ - +
| | |
@@ -34,13 +46,17 @@ 用户权限管理 - 角色管理 + + 角色管理 - 用户管理 + + 用户管理 - 组织架构 + 组织架构 - 安全日志 + + 安全日志 @@ -48,52 +64,118 @@ 基础字典 - 导引类别 - 体检报告类别 - 性别 - 婚姻状况 - 民族 - 籍贯 - 结果状态 - 体检类别 - 人员类别 - 仪器类别 - 标本类型 - 单位 - 诊断后缀 - 体检结论类别 - 体检结论 - 标本容器 - 常用字符类别 - 常用字符 - 客户单位类别 - 项目默认结果 - 诊断级别 + 导引类别 + 体检报告类别 + 性别 + 婚姻状况 + 民族 + 籍贯 + 结果状态 + 体检类别 + 人员类别 + 仪器类别 + 标本类型 + 单位 + 诊断后缀 + 体检结论类别 + 体检结论 + 标本容器 + 常用字符类别 + 常用字符 + 客户单位类别 + 项目默认结果 + 诊断级别 - - 发票项目类别 - 支付方式 + 发票项目类别 + 支付方式 - - 项目类别 - 条码分组 - 组和项目 - 项目 - 参考范围 - 诊断 - 项目结果模板 + 项目类别 + 条码分组 + 组和项目 + 项目 + 参考范围 + 诊断 + 项目结果模板 + 项目结果匹配 + 项目模板 + 套餐 - diff --git a/src/views/basic-dictionary/MedicalConclusion.vue b/src/views/basic-dictionary/MedicalConclusion.vue index aaf90eb..44e6d5f 100644 --- a/src/views/basic-dictionary/MedicalConclusion.vue +++ b/src/views/basic-dictionary/MedicalConclusion.vue @@ -4,11 +4,22 @@ - + +
+ {{ item.displayName }} +
+ - 类别选择 - - + 类别选择 + + - + @@ -44,15 +74,26 @@ - + @@ -62,7 +103,12 @@
新增 - 编辑 + 编辑
删除
@@ -72,32 +118,52 @@ 置底
- 排序 + 排序
- 取消 + 取消
- + - + - + 类别 - + @@ -111,7 +177,11 @@ - + @@ -121,7 +191,11 @@ - + @@ -133,6 +207,7 @@ diff --git a/src/views/fee-settings/ItemResultMatch.vue b/src/views/fee-settings/ItemResultMatch.vue new file mode 100644 index 0000000..d13a92a --- /dev/null +++ b/src/views/fee-settings/ItemResultMatch.vue @@ -0,0 +1,421 @@ + + + \ No newline at end of file diff --git a/src/views/fee-settings/ItemResultTemplate.vue b/src/views/fee-settings/ItemResultTemplate.vue index 14e1392..1828f13 100644 --- a/src/views/fee-settings/ItemResultTemplate.vue +++ b/src/views/fee-settings/ItemResultTemplate.vue @@ -1,54 +1,458 @@ + \ No newline at end of file diff --git a/src/views/fee-settings/MedicalPackage.vue b/src/views/fee-settings/MedicalPackage.vue new file mode 100644 index 0000000..949db03 --- /dev/null +++ b/src/views/fee-settings/MedicalPackage.vue @@ -0,0 +1,414 @@ + + + \ No newline at end of file