From 3b5ff0651c049d5def8fd789c52ec26188a1e8a1 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期五, 21 十一月 2025 10:45:13 +0800
Subject: [PATCH] 测试完成
---
dist (2).zip | 0
dist.zip | 0
vue.config.js | 4
src/views/followvisit/record/detailpage/index.vue | 38 +++++-
src/api/AiCentre/Qtemplate.js | 8 +
src/router/index.js | 237 ++++++++++++++++++++-------------------
src/views/followvisit/record/index.vue | 31 +++-
src/views/patient/propaganda/QuestionnaireTask.vue | 25 ++-
8 files changed, 199 insertions(+), 144 deletions(-)
diff --git "a/dist \0502\051.zip" "b/dist \0502\051.zip"
new file mode 100644
index 0000000..0849c84
--- /dev/null
+++ "b/dist \0502\051.zip"
Binary files differ
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..943fe42
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/AiCentre/Qtemplate.js b/src/api/AiCentre/Qtemplate.js
index 5853929..479007d 100644
--- a/src/api/AiCentre/Qtemplate.js
+++ b/src/api/AiCentre/Qtemplate.js
@@ -9,6 +9,14 @@
data: data,
});
}
+// 鏌ヨ闂嵎妯℃澘鍒楄〃
+export function taskgetQtemplateobj(data) {
+ return request({
+ url: "smartor/svytemplateTask/selectInfoByCondition",
+ method: "post",
+ data: data,
+ });
+}
// 闂嵎妯℃澘鍒楄〃
export function getQtemplatelist(data) {
return request({
diff --git a/src/router/index.js b/src/router/index.js
index 8fe8951..b96f433 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,10 +1,10 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
-Vue.use(Router)
+Vue.use(Router);
/* Layout */
-import Layout from '@/layout'
+import Layout from "@/layout";
/**
* Note: 璺敱閰嶇疆椤�
@@ -31,182 +31,187 @@
// 鍏叡璺敱
export const constantRoutes = [
{
- path: '/redirect',
+ path: "/redirect",
component: Layout,
hidden: true,
children: [
{
- path: '/redirect/:path(.*)',
- component: () => import('@/views/redirect')
- }
- ]
+ path: "/redirect/:path(.*)",
+ component: () => import("@/views/redirect"),
+ },
+ ],
},
{
- path: '/login',
- component: () => import('@/views/login'),
- hidden: true
- },
- {
- path: '/loginSSO',
- component: () => import('@/views/loginSSO'),
- hidden: true
+ path: "/login",
+ component: () => import("@/views/login"),
+ hidden: true,
},
{
- path: '/sf',
- component: () => import('@/views/outsideChainnew'),
- hidden: true
+ path: "/loginSSO",
+ component: () => import("@/views/loginSSO"),
+ hidden: true,
},
{
- path: '/wt',
- component: () => import('@/views/outsideChainwtnew'),
- hidden: true
+ path: "/sf",
+ component: () => import("@/views/outsideChainnew"),
+ hidden: true,
},
{
- path: '/xj',
- component: () => import('@/views/outsideChainxjnew'),
- hidden: true
+ path: "/wt",
+ component: () => import("@/views/outsideChainwtnew"),
+ hidden: true,
},
{
- path: '/satisfaction',
- component: () => import('@/views/satisfaction'),
- hidden: true
+ path: "/xj",
+ component: () => import("@/views/outsideChainxjnew"),
+ hidden: true,
},
{
- path: '/outsideChain',
- component: () => import('@/views/outsideChain'),
- hidden: true
+ path: "/satisfaction",
+ component: () => import("@/views/satisfaction"),
+ hidden: true,
},
{
- path: '/outsideChainwt',
- component: () => import('@/views/outsideChainwt'),
- hidden: true
+ path: "/outsideChain",
+ component: () => import("@/views/outsideChain"),
+ hidden: true,
},
{
- path: '/outsideChainxj',
- component: () => import('@/views/outsideChainxj'),
- hidden: true
+ path: "/outsideChainwt",
+ component: () => import("@/views/outsideChainwt"),
+ hidden: true,
},
{
- path: '/previews',
- component: () => import('@/views/previews'),
- hidden: true
+ path: "/outsideChainxj",
+ component: () => import("@/views/outsideChainxj"),
+ hidden: true,
},
{
- path: '/register',
- component: () => import('@/views/register'),
- hidden: true
+ path: "/previews",
+ component: () => import("@/views/previews"),
+ hidden: true,
},
{
- path: '/404',
- component: () => import('@/views/error/404'),
- hidden: true
+ path: "/register",
+ component: () => import("@/views/register"),
+ hidden: true,
},
{
- path: '/401',
- component: () => import('@/views/error/401'),
- hidden: true
+ path: "/404",
+ component: () => import("@/views/error/404"),
+ hidden: true,
},
{
- path: '',
+ path: "/401",
+ component: () => import("@/views/error/401"),
+ hidden: true,
+ },
+ {
+ path: "",
component: Layout,
- redirect: 'index',
+ redirect: "index",
children: [
{
- path: 'index',
- component: () => import('@/views/index'),
- name: 'Index',
- meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
- }
- ]
+ path: "index",
+ component: () => import("@/views/index"),
+ name: "Index",
+ meta: {
+ title: "棣栭〉",
+ icon: "dashboard",
+ affix: true,
+ roles: ["admin", "sysadmin"],
+ },
+ },
+ ],
},
{
- path: '/user',
+ path: "/user",
component: Layout,
hidden: true,
- redirect: 'noredirect',
+ redirect: "noredirect",
children: [
{
- path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
- name: 'Profile',
- meta: { title: '涓汉涓績', icon: 'user' }
- }
- ]
- }
-]
+ path: "profile",
+ component: () => import("@/views/system/user/profile/index"),
+ name: "Profile",
+ meta: { title: "涓汉涓績", icon: "user" },
+ },
+ ],
+ },
+];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
{
- path: '/system/user-auth',
+ path: "/system/user-auth",
component: Layout,
hidden: true,
- permissions: ['system:user:edit'],
+ permissions: ["system:user:edit"],
children: [
{
- path: 'role/:userId(\\d+)',
- component: () => import('@/views/system/user/authRole'),
- name: 'AuthRole',
- meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user' }
- }
- ]
+ path: "role/:userId(\\d+)",
+ component: () => import("@/views/system/user/authRole"),
+ name: "AuthRole",
+ meta: { title: "鍒嗛厤瑙掕壊", activeMenu: "/system/user" },
+ },
+ ],
},
{
- path: '/system/role-auth',
+ path: "/system/role-auth",
component: Layout,
hidden: true,
- permissions: ['system:role:edit'],
+ permissions: ["system:role:edit"],
children: [
{
- path: 'user/:roleId(\\d+)',
- component: () => import('@/views/system/role/authUser'),
- name: 'AuthUser',
- meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
- }
- ]
+ path: "user/:roleId(\\d+)",
+ component: () => import("@/views/system/role/authUser"),
+ name: "AuthUser",
+ meta: { title: "鍒嗛厤鐢ㄦ埛", activeMenu: "/system/role" },
+ },
+ ],
},
{
- path: '/system/dict-data',
+ path: "/system/dict-data",
component: Layout,
hidden: true,
- permissions: ['system:dict:list'],
+ permissions: ["system:dict:list"],
children: [
{
- path: 'index/:dictId(\\d+)',
- component: () => import('@/views/system/dict/data'),
- name: 'Data',
- meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
- }
- ]
+ path: "index/:dictId(\\d+)",
+ component: () => import("@/views/system/dict/data"),
+ name: "Data",
+ meta: { title: "瀛楀吀鏁版嵁", activeMenu: "/system/dict" },
+ },
+ ],
},
{
- path: '/monitor/job-log',
+ path: "/monitor/job-log",
component: Layout,
hidden: true,
- permissions: ['monitor:job:list'],
+ permissions: ["monitor:job:list"],
children: [
{
- path: 'index/:jobId(\\d+)',
- component: () => import('@/views/monitor/job/log'),
- name: 'JobLog',
- meta: { title: '璋冨害鏃ュ織', activeMenu: '/monitor/job' }
- }
- ]
+ path: "index/:jobId(\\d+)",
+ component: () => import("@/views/monitor/job/log"),
+ name: "JobLog",
+ meta: { title: "璋冨害鏃ュ織", activeMenu: "/monitor/job" },
+ },
+ ],
},
{
- path: '/tool/gen-edit',
+ path: "/tool/gen-edit",
component: Layout,
hidden: true,
- permissions: ['tool:gen:edit'],
+ permissions: ["tool:gen:edit"],
children: [
{
- path: 'index/:tableId(\\d+)',
- component: () => import('@/views/tool/gen/editTable'),
- name: 'GenEdit',
- meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' }
- }
- ]
- }/*,
+ path: "index/:tableId(\\d+)",
+ component: () => import("@/views/tool/gen/editTable"),
+ name: "GenEdit",
+ meta: { title: "淇敼鐢熸垚閰嶇疆", activeMenu: "/tool/gen" },
+ },
+ ],
+ } /*,
{
path: '/smartor/archive',
component: Layout,
@@ -220,17 +225,17 @@
meta: { title: '鎮ｈ�呯淮鎶�', activeMenu: '/archive/add' }
}
]
- }*/
-]
+ }*/,
+];
// 闃叉杩炵画鐐瑰嚮澶氭璺敱鎶ラ敊
let routerPush = Router.prototype.push;
Router.prototype.push = function push(location) {
- return routerPush.call(this, location).catch(err => err)
-}
+ return routerPush.call(this, location).catch((err) => err);
+};
export default new Router({
- mode: 'history', // 鍘绘帀url涓殑#
+ mode: "history", // 鍘绘帀url涓殑#
scrollBehavior: () => ({ y: 0 }),
- routes: constantRoutes
-})
+ routes: constantRoutes,
+});
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 36faefa..dd4879a 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1405,7 +1405,7 @@
methods: {
// 鑾峰彇涓婚鏍峰紡绫�
getTopicClass(item) {
- console.log(item.isabnormal,'111');
+ console.log(item.isabnormal, "111");
// 鏍规嵁鐘舵�佸�艰繑鍥炲搴旂殑鏍峰紡绫�
if (item.isabnormal == 1) {
@@ -2053,10 +2053,34 @@
// 璋冭捣鍐嶆鍙戦��
sendAgain() {
- document.querySelector("#app").scrollTo(0, 0);
- // scrollTo(0, 0)
- this.formtidy();
- this.dialogFormVisible = true;
+ getTaskservelist({
+ patid: this.patid,
+ visitCount: 2,
+ leaveldeptcodes: [this.form.deptcode],
+ }).then((res) => {
+ if (res.rows[0].serviceSubtaskList) {
+ if (
+ res.rows[0].serviceSubtaskList[0].sendstate != 5 &&
+ res.rows[0].serviceSubtaskList[0].sendstate != 6
+ ) {
+ this.$modal
+ .confirm(
+ '鏈偅鑰呭湪"' +
+ res.rows[0].serviceSubtaskList[0].deptname +
+ '"绉戝涓嬪凡鏈夊啀娆￠殢璁挎湇鍔¤繘琛屼腑鏄惁缁х画鍒涘缓锛�'
+ )
+ .then(() => {
+ document.querySelector("#app").scrollTo(0, 0);
+ this.formtidy();
+ this.dialogFormVisible = true;
+ });
+ }
+ } else {
+ document.querySelector("#app").scrollTo(0, 0);
+ this.formtidy();
+ this.dialogFormVisible = true;
+ }
+ });
},
// 鏌ョ湅璇︽儏
Seedetails(row) {
@@ -2232,7 +2256,8 @@
astrict: index === questionIndex + 1 ? 0 : item.astrict,
hiddenByEnd: index === questionIndex + 1 ? false : item.hiddenByEnd,
}));
- }2
+ }
+ 2;
this.$forceUpdate();
},
@@ -2643,7 +2668,6 @@
/* 鏂板锛氳鍛婄姸鎬佹牱寮� - 榛勮壊 */
.scriptTopic-warning {
color: #d4be00; /* 鎮ㄦ寚瀹氱殑榛勮壊 */
-
}
/* 寮傚父閫夐」鏍峰紡 - 绾㈣壊鏄熷彿 (淇濇寔涓嶅彉) */
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 332a54a..c4f4ee9 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -107,7 +107,12 @@
@change="handleChange"
></el-cascader>
</el-form-item>
-
+ <el-form-item label="璇婃柇鍚嶇О" prop="leavediagname">
+ <el-input
+ v-model="topqueryParams.leavediagname"
+ placeholder="璇疯緭鍏ヨ瘖鏂悕绉�"
+ ></el-input>
+ </el-form-item>
<el-form-item label="浠诲姟鐘舵��" prop="status">
<el-select v-model="topqueryParams.sendstate" placeholder="璇烽�夋嫨">
<el-option
@@ -149,7 +154,7 @@
<el-col :span="1.5">
<el-button
type="primary"
- icon="el-icon-plus"
+ icon="el-icon-plus"
size="medium"
@click="handleAdd"
>鏂板</el-button
@@ -402,7 +407,15 @@
key="drname"
prop="drname"
/>
-
+ <el-table-column
+ label="璇婃柇鍚嶇О"
+ align="center"
+ key="leavediagname"
+ prop="leavediagname"
+ width="120"
+ :show-overflow-tooltip="true"
+ >
+ </el-table-column>
<!-- <el-table-column
label="鐥呭巻鍙�"
align="center"
@@ -1412,9 +1425,9 @@
Seedetails(row) {
let type = "";
console.log(row, "rwo");
- if (row.type == 1) {
- type = 1;
- }
+ if (row.type == 1) {
+ type = 1;
+ }
this.$router.push({
path: "/followvisit/record/detailpage/",
query: {
@@ -1588,11 +1601,11 @@
}
}
::v-deep.leftvlue .el-card__body {
- background: #F2F8FF;
- color: #324A9B;
+ background: #f2f8ff;
+ color: #324a9b;
}
::v-deep.leftvlue .el-card__body:hover {
- background: #3664D9;
+ background: #3664d9;
color: #fff;
cursor: pointer; /* 榧犳爣鎮诞鏃跺彉涓烘墜褰� */
}
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index d558652..22db733 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -917,6 +917,7 @@
Externallist,
getQtemplatelist,
getQtemplateobj,
+ taskgetQtemplateobj,
TaskQuestioncomit,
deleteTaskQuestioncomit,
Questionnairetaskgetson,
@@ -1473,7 +1474,7 @@
this.form.preachformList = this.selectedOrder;
} else {
this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷");
- this.submitLoading = false;
+ this.submitLoading = false;
return;
}
@@ -1490,7 +1491,7 @@
) {
} else {
this.$modal.msgError("璇烽�夋嫨浠诲姟鍏宠仈鏉′欢");
- this.submitLoading = false;
+ this.submitLoading = false;
return;
}
//鏆傚仠浠诲姟鎮ｈ�呴檺鍒�
@@ -1501,7 +1502,7 @@
if (!this.form.templatename && !this.templateor) {
this.$modal.msgError("鏈�夋嫨妯℃澘");
- this.submitLoading = false;
+ this.submitLoading = false;
return;
}
@@ -1515,7 +1516,7 @@
this.form.longTask
) {
} else {
- this.submitLoading = false;
+ this.submitLoading = false;
return this.$modal.msgError("鏃堕棿淇℃伅缂哄け");
}
const filteredArray = this.variableList.filter(
@@ -1594,6 +1595,8 @@
},
// 棰勮
previewfnmb() {
+ // taskgetQtemplateobj({ id: this.form.templateid });
+
getTaskQuestioncomit(this.form.templateid).then((res) => {
if (res.code == 200) {
console.log(res, "棰勮鏁版嵁");
@@ -1604,15 +1607,17 @@
this.getillness(this.form.libtemplateid);
this.previewtf = true;
- getQtemplateobj({ svyid: this.form.libtemplateid }).then((res) => {
+ taskgetQtemplateobj({ id: this.form.templateid }).then((res) => {
if (res.code == 200) {
- this.questionList = res.rows[0].svyTemplateLibScripts;
+ this.questionList = res.data.svyTaskTemplateScriptVOS;
this.questionList.forEach((item) => {
item.qremark = [];
+ item.svyLibTemplateTargetoptions =
+ item.svyTaskTemplateTargetoptions;
});
this.previewtftype = 1;
this.objyl.svyTemplateLibScripts =
- res.rows[0].svyTemplateLibScripts;
+ res.data.svyTaskTemplateScriptVOS;
}
});
}
@@ -2135,8 +2140,8 @@
},
// 鐤剧梾鍒犻櫎瑙﹀彂
removediagg(row) {
- console.log(row,'row');
-console.log(this.diagglist,'this.diagglist');
+ console.log(row, "row");
+ console.log(this.diagglist, "this.diagglist");
let result = this.diagglist
.filter((item) => item.icd10code == row)
@@ -2270,7 +2275,7 @@
TaskQuestioncomit(this.objyl).then((response) => {
this.previewtf = false;
this.form.libtemplateid = this.objyl.svyid;
- this.form.libtemplatename = this.objyl.svyname;
+ this.form.libtemplatename = this.objyl.svyname;
this.form.templateid = response.data;
this.form.templatename = this.objyl.svyname;
this.$modal.msgSuccess("閫夋嫨妯℃澘鎴愬姛");
diff --git a/vue.config.js b/vue.config.js
index eb49c4a..a902bfd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,8 +38,8 @@
// target: `https://www.health-y.cn/lssf`,
// target: `http://192.168.100.10:8096`,
// target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
- target: `http://192.168.100.10:8095`,//鏂板崕
- // target:`http://localhost:8095`,
+ // target: `http://192.168.100.10:8095`,//鏂板崕
+ target:`http://localhost:8095`,
// target:`http://35z1t16164.qicp.vip`,
// target: `http://192.168.100.193:8095`,
// target: `http://192.168.101.166:8093`,
--
Gitblit v1.9.3