From dacf3c6ae5ede1c0a8a8b4afb24e2a3b62f0e368 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 21 十一月 2023 15:39:28 +0800
Subject: [PATCH] Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/followvisit/tasklist/index.vue | 4
src/api/system/tag.js | 12 +-
src/views/followvisit/tasklist/FollowupDetails/index.vue | 44 +++++---
vue.config.js | 4
src/views/system/label/index.vue | 40 +++++--
package.json | 3
src/views/patient/patient/index.vue | 24 +++-
src/api/smartorpor/pat_archive.js | 24 ++++
src/api/patient/homepage.js | 14 +-
src/components/SFtable/index.vue | 99 +++++++++++++++++++
10 files changed, 212 insertions(+), 56 deletions(-)
diff --git a/package.json b/package.json
index ec9f09c..18e00e7 100644
--- a/package.json
+++ b/package.json
@@ -38,9 +38,9 @@
"dependencies": {
"@antv/x6": "^1.18.3",
"@antv/x6-vue-shape": "^1.2.3",
- "@vue/composition-api": "^1.0.0-rc.6",
"@riophae/vue-treeselect": "0.4.0",
"@vue/babel-plugin-jsx": "^1.1.5",
+ "@vue/composition-api": "^1.0.0-rc.6",
"axios": "0.24.0",
"clipboard": "2.0.8",
"codemirror": "^5.65.13",
@@ -52,6 +52,7 @@
"file-saver": "^2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
+ "insert-css": "^2.0.0",
"jquery": "^3.7.0",
"js-beautify": "1.13.0",
"js-cookie": "3.0.1",
diff --git a/src/api/patient/homepage.js b/src/api/patient/homepage.js
index dadf02b..8ede6e1 100644
--- a/src/api/patient/homepage.js
+++ b/src/api/patient/homepage.js
@@ -2,13 +2,13 @@
import { parseStrEmpty } from "@/utils/ruoyi";//澶勭悊瀛楃涓�,und,null杞崲涓�'';
// 鏌ヨ鎮ｈ�呭垪琛�
-// export function listpatient(query) {
-// return request({
-// url: '/smartor/patarchive/list',
-// method: 'get',
-// params: query
-// })
-// };
+export function listpatient(query) {
+ return request({
+ url: '/smartor/patarchive/list',
+ method: 'get',
+ params: query
+ })
+};
// 鐢ㄦ埛淇℃伅鏌ヨ鎮ｈ�呭垪琛�
export function messagelistpatient(data) {
return request({
diff --git a/src/api/smartorpor/pat_archive.js b/src/api/smartorpor/pat_archive.js
index 7845d69..b8f03eb 100644
--- a/src/api/smartorpor/pat_archive.js
+++ b/src/api/smartorpor/pat_archive.js
@@ -1,6 +1,28 @@
/*鎮ｈ�呮。妗圓PI鎺ュ彛
- patid// 鑷ID
name// 濮撳悕
sex// 鎬у埆 1:鐢� 2:濂�
iccardno// 璇佷欢鍙风爜
birthdate// 鐢熸棩
age// 骞撮緞
source// 鏉ユ簮
archivetime// 寤烘。鏃堕棿
archiveby// 寤烘。浜�
telcode// 鎵嬫満鍙风爜
relativetelcode// 浜插睘鍙风爜
iccardtype// 璇佷欢绫诲瀷
orgid// 鏈烘瀯ID
openid// 寰俊openid
del_flag// 鍒犻櫎鏍囪
update_by// 鏇存柊浜�
update_time// 鏇存柊鏃堕棿
create_by// 鍒涘缓浜�
create_time// 鍒涘缓鏃堕棿
isupload// 涓婁紶鏍囪
upload_time// 涓婁紶鏃堕棿
pid//鐖禝D
guid//GUID
+ patid// 鑷ID
+ name// 濮撳悕
+ sex// 鎬у埆 1:鐢� 2:濂�
+ iccardno// 璇佷欢鍙风爜
+ birthdate// 鐢熸棩
+ age// 骞撮緞
+ source// 鏉ユ簮
+ archivetime// 寤烘。鏃堕棿
+ archiveby// 寤烘。浜�
+ telcode// 鎵嬫満鍙风爜
+ relativetelcode// 浜插睘鍙风爜
+ iccardtype// 璇佷欢绫诲瀷
+ orgid// 鏈烘瀯ID
+ openid// 寰俊openid
+ del_flag// 鍒犻櫎鏍囪
+ update_by// 鏇存柊浜�
+ update_time// 鏇存柊鏃堕棿
+ create_by// 鍒涘缓浜�
+ create_time// 鍒涘缓鏃堕棿
+ isupload// 涓婁紶鏍囪
+ upload_time// 涓婁紶鏃堕棿
+ pid//鐖禝D
+ guid//GUID
*/
import request from '@/utils/request'
diff --git a/src/api/system/tag.js b/src/api/system/tag.js
index d7d085e..0c00b1c 100644
--- a/src/api/system/tag.js
+++ b/src/api/system/tag.js
@@ -3,8 +3,8 @@
// 鏌ヨ鏍囩鍒楄〃
export function listTag(query) {
return request({
- url: '/system/tag/list',
- method: 'get',
+ url: '/base/tag/list',
+ method: 'post',
params: query
})
}
@@ -12,7 +12,7 @@
// 鏌ヨ鏍囩璇︾粏
export function getTag(tagid) {
return request({
- url: '/system/tag/' + tagid,
+ url: '/base/tag/' + tagid,
method: 'get'
})
}
@@ -20,7 +20,7 @@
// 鏂板鏍囩
export function addTag(data) {
return request({
- url: '/system/tag',
+ url: '/base/tag',
method: 'post',
data: data
})
@@ -29,7 +29,7 @@
// 淇敼鏍囩
export function updateTag(data) {
return request({
- url: '/system/tag',
+ url: '/base/tag',
method: 'put',
data: data
})
@@ -38,7 +38,7 @@
// 鍒犻櫎鏍囩
export function delTag(tagid) {
return request({
- url: '/system/tag/' + tagid,
+ url: '/base/tag/' + tagid,
method: 'delete'
})
}
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
new file mode 100644
index 0000000..4740111
--- /dev/null
+++ b/src/components/SFtable/index.vue
@@ -0,0 +1,99 @@
+<template>
+ <el-table
+ :data="currentList"
+ style="width: 1158px"
+ :header-cell-style="{
+ background: '#f3f6fb',
+ color: '#666',
+ height: '42px',
+ 'font-weight': 400,
+ }"
+ :highlight-current-row="true"
+ empty-text="鏆傛棤鏁版嵁"
+ >
+ <el-table-column type="index" :index="indexMethod" label="搴忓彿" width="80">
+ </el-table-column>
+ <el-table-column
+ v-for="(item, index) in tableLabel"
+ :key="index"
+ :prop="item.prop"
+ :width="item.width"
+ :label="item.label"
+ :formatter="formatData"
+ >
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="100">
+ <template slot-scope="scope">
+ <el-button type="text" @click.native="$emit('details', scope.row)"
+ >鏌ョ湅璇︽儏</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+
+ <script>
+ import dayjs from "dayjs";
+ export default {
+ data() {
+ return {};
+ },
+ props: {
+ currentList: {
+ type: Array,
+ required: true,
+ },
+ tableLabel: {
+ type: Array,
+ default: () => [],
+ },
+ currentIndex: {
+ type: Number,
+ required: true,
+ },
+ },
+ created() {},
+
+ methods: {
+ indexMethod(index) {
+ return parseInt(this.currentIndex) - 9 + index;
+ },
+ // 鏁版嵁杩囨护
+ formatData(row, column, cellValue) {
+ if (column.property === "createType") {
+ if (cellValue === 1) {
+ return "鑷姩";
+ }
+ return "鎵嬪姩";
+ }
+ if (column.property === "createTime") {
+ return dayjs(cellValue).format("YYYY.MM.DD HH:mm:ss");
+ }
+ return cellValue;
+ },
+ },
+ };
+ </script>
+
+ <style lang="scss">
+ .el-table td,
+ .el-table th.is-leaf {
+ border-bottom: unset;
+ }
+ .el-table td,
+ .el-table th {
+ padding: 5px 0;
+ }
+ .el-table thead {
+ font-weight: 400;
+ color: #666;
+ }
+ .dialog-footer {
+ width: 100%;
+ padding: 10px 20px 20px;
+ text-align: center !important;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+ </style>
+
\ No newline at end of file
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index b480e12..fb1809f 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -138,7 +138,7 @@
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in topicoptions"
+ v-for="item in taskoptions"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -181,11 +181,11 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-select
- v-model="topqueryParams.topic"
+ v-model="tasktopic"
placeholder="璇烽�夋嫨鏂板绫诲瀷"
>
<el-option
- v-for="item in topicoptions"
+ v-for="item in taskoptions"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -199,23 +199,13 @@
plain
icon="el-icon-plus"
size="medium"
+ :disabled="!tasktopic"
@click="handleAdd"
v-hasPermi="['system:user:add']"
>鏂板</el-button
>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="medium"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:user:edit']"
- >淇敼</el-button
- >
- </el-col>
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -1048,6 +1038,7 @@
userList: null,
patientuserList: null,
sonuserList: null,
+ tasktopic: null, //鏂板绫诲瀷
form: {
name: "",
region: "",
@@ -1080,6 +1071,24 @@
label: "鍖椾含鐑ら腑",
},
],
+ taskoptions: [
+ {
+ value: "1",
+ label: "閫氱煡",
+ },
+ {
+ value: "2",
+ label: "闅忚",
+ },
+ {
+ value: "3",
+ label: "闂嵎",
+ },
+ {
+ value: "4",
+ label: "瀹ｆ暀",
+ },
+ ],
quote: false,
};
},
@@ -1087,6 +1096,7 @@
created() {
this.Addsubtask();
this.Getsubtask();
+
},
methods: {
@@ -1107,6 +1117,7 @@
},
// 瀛愪换鍔′竴绾у脊妗�
handleAdd() {
+ this.multiple = true;
listsvr_prjtaskline(this.deliverytopqueryParams).then((response) => {
console.log(response);
this.sonuserList = response.rows;
@@ -1117,6 +1128,7 @@
},
// 瀛愪换鍔′簩绾у脊妗�
handleAddpatient() {
+ console.log(this.multiple);
listpat_archive(this.patientqueryParams).then((response) => {
console.log(response);
this.patientuserList = response.rows;
@@ -1130,8 +1142,10 @@
handleExport() {},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.ids = null;
this.ids = selection.map((item) => item.patid).join(",");
// let result = this.ids.join(",");
+ this.multiple = !selection.length;
console.log(this.ids);
},
getList() {},
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1849fc0..0758e88 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -156,7 +156,7 @@
prop="describe"
/>
<el-table-column
- label="浠诲姟鎬绘暟"
+ label="瀛愪换鍔℃�绘暟"
align="center"
key="nickName"
prop="nickName"
@@ -579,7 +579,7 @@
/** 鏌ヨ闂ㄨ瘖闅忚鍒楄〃 */
getList() {
this.loading = true;
- listsvr_prj(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+ listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
(response) => {
console.log(response);
this.userList = response.rows;
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 21b21c1..a90e1da 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -478,8 +478,16 @@
updatepat_archive,
delpat_archive,
} from "@/api/smartorpor/pat_archive";
-import { listbase_tag } from "@/api/smartorpor/base_tag";
-
+import {
+ messagelistpatient,
+ alterpatient,
+ addpatient,
+ particularpatient,
+ deletepatient,
+ Exporterrorpatient,
+ toleadpatient,
+} from "@/api/patient/homepage";
+import { listtag } from "@/api/system/label";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -634,7 +642,7 @@
/** 鏌ヨ鎮ｈ�呭垪琛� */
getList() {
this.loading = true;
- listpat_archive(this.queryParams).then((response) => {
+ messagelistpatient(this.queryParams).then((response) => {
console.log(response);
this.userList = response.rows;
this.total = response.total;
@@ -644,7 +652,7 @@
/** 鏌ヨ鏍囩鍒楄〃 */
gettabList() {
const queryParams = {};
- listbase_tag().then((response) => {
+ listtag().then((response) => {
console.log(response);
this.optionstag = response.rows;
});
@@ -718,7 +726,7 @@
handleUpdate(row) {
console.log(row);
const userIds = row.patid || this.ids;
- getpat_archive(userIds).then((response) => {
+ particularpatient(userIds).then((response) => {
console.log(response);
this.form = response.data;
});
@@ -729,7 +737,7 @@
//淇敼/鏂板鎮ｈ��
submitForm() {
if (this.amendtag) {
- updatepat_archive(this.form)
+ alterpatient(this.form)
.then((response) => {
console.log(response);
})
@@ -738,7 +746,7 @@
this.$modal.msgSuccess("淇敼鎴愬姛");
});
} else {
- addpat_archive(this.form)
+ addpatient(this.form)
.then((response) => {
console.log(response);
})
@@ -758,7 +766,7 @@
this.$modal
.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�')
.then(function () {
- return delpat_archive(userIds);
+ return deletepatient(userIds);
})
.then(() => {
this.getList();
diff --git a/src/views/system/label/index.vue b/src/views/system/label/index.vue
index 001f3df..f42d302 100644
--- a/src/views/system/label/index.vue
+++ b/src/views/system/label/index.vue
@@ -195,8 +195,8 @@
<template slot-scope="scope">
<el-switch
v-model="scope.row.isupload"
- :active-value="'1'"
- :inactive-value="'0'"
+ :active-value="1"
+ :inactive-value="0"
active-color="#13ce66"
@change="handleStatusChange(scope.row)"
></el-switch>
@@ -325,7 +325,19 @@
</template>
<script>
-import { changetagcategory } from "@/api/system/label";
+import {
+ changetagcategory,
+ toamendtag,
+ toamendtagcategory,
+ addapitag,
+ addtagcategory,
+ detailstag,
+ deletetag,
+ deletetagcategory,
+ exporttag,
+ listtag,
+ tagclassifylist,
+} from "@/api/system/label";
import {
listbase_tag,
getbase_tag,
@@ -513,7 +525,7 @@
methods: {
/** 鏌ヨ鏍囩鍒楄〃 */
getList() {
- listbase_tag(this.addDateRange(this.queryParams)).then((response) => {
+ listtag(this.addDateRange(this.queryParams)).then((response) => {
console.log(response);
this.total = response.total;
this.userList = response.rows;
@@ -546,13 +558,13 @@
// 娣诲姞/淇敼鏍囩
Maintenancetag() {
if (this.lstamendtag) {
- updatebase_tag(this.addDateRange(this.tagform)).then((response) => {
+ toamendtag(this.addDateRange(this.tagform)).then((response) => {
console.log(response);
this.lstamendtagVisible = false;
this.getList();
});
} else {
- addbase_tag(this.addDateRange(this.tagform)).then((response) => {
+ addapitag(this.addDateRange(this.tagform)).then((response) => {
console.log(response);
this.lstamendtagVisible = false;
@@ -570,7 +582,7 @@
// 鑾峰彇鏍囩鍒嗙被
gitclasify() {
- listbase_tagcategory(this.addDateRange(this.forms)).then((response) => {
+ tagclassifylist(this.addDateRange(this.forms)).then((response) => {
console.log(response);
this.numberlb = response.total;
this.editableTabs = response.rows;
@@ -580,14 +592,14 @@
submitsidecolumn() {
if (this.amendtag) {
this.classifyform.tagcategoryid = this.idds;
- updatebase_tagcategory(this.addDateRange(this.classifyform)).then(
+ toamendtagcategory(this.addDateRange(this.classifyform)).then(
(response) => {
console.log(response);
this.gitclasify();
}
);
} else {
- addbase_tagcategory(this.addDateRange(this.classifyform)).then(
+ addtagcategory(this.addDateRange(this.classifyform)).then(
(response) => {
console.log(response);
this.gitclasify();
@@ -603,7 +615,7 @@
//鍒犻櫎鍒嗙被
deletefenlei(row) {
if (this.deleteVisible) {
- delbase_tagcategory(this.idds).then((response) => {
+ deletetagcategory(this.idds).then((response) => {
console.log(response);
this.gitclasify();
});
@@ -643,17 +655,17 @@
// 鏍囩鐘舵�佷慨鏀�
handleStatusChange(row) {
console.log(row.isupload);
- let text = row.isupload == "0" ? "鍋滅敤" : "鍚敤";
+ let text = row.isupload == 0 ? "鍋滅敤" : "鍚敤";
this.$modal
.confirm('纭瑕�"' + text + '""' + row.tagname + '"鏍囩鍚楋紵')
.then(function () {
- return updatebase_tag(row);
+ return toamendtag(row);
})
.then(() => {
this.$modal.msgSuccess(text + "鎴愬姛");
})
.catch(function () {
- row.isupload = row.isupload == "0" ? "1" : "0";
+ row.isupload = row.isupload == 0 ? 1 : 0;
});
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -689,7 +701,7 @@
: "鏄惁纭鍒犻櫎閫変腑鐨勬暟鎹」锛�"
)
.then(function () {
- return delbase_tag(tagids);
+ return deletetag(tagids);
})
.then(() => {
this.getList();
diff --git a/vue.config.js b/vue.config.js
index 6148e6a..cb5e5a9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,8 +36,8 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target1: `http://192.168.1.4:8080`,
- // target: `http://192.168.1.3:8080`,
- target: `http://www.hxsoft.com:8080`,
+ target:`http://localhost:8080`,
+ // target: `http://www.hxsoft.com:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3