From 4cf6b258a3b390bb89ef4f02d3bb6a7a4d261e85 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 20 六月 2025 14:10:24 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/patient/index.vue | 16 ++++++++++------
src/components/SFtable/index.vue | 20 ++++++++++++++++++++
src/views/patient/propaganda/QuestionnaireTask.vue | 24 +++++++++++++-----------
3 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index d8eee6d..85758a2 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -33,6 +33,22 @@
key="id"
prop="id"
/>
+ <el-table-column
+ v-if="agenumber"
+ label="骞撮緞"
+ align="center"
+ key="age"
+ prop="age"
+ width="160"
+ >
+ <template slot-scope="scope">
+ <span v-if="scope.row.age"
+ >{{ scope.row.age }}{{ scope.row.ageUnit }}</span
+ ><span v-if="scope.row.age2"
+ >{{ scope.row.age2 }}{{ scope.row.ageUnit2 }}</span
+ >
+ </template>
+ </el-table-column>
<div v-for="(item, index) in tableLabel">
<el-table-column
v-if="item.label == '鍑洪櫌鏃ユ湡'"
@@ -197,6 +213,10 @@
type: Boolean,
default: true,
},
+ agenumber: {
+ type: Boolean,
+ default: false,
+ },
// 1妯℃澘鍒楄〃 2閫変腑鎮ｈ�� 3鎮ｈ�呭垪琛�
typeinfo: {
type: Number,
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index eefb062..8f7db1a 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -209,11 +209,15 @@
key="age"
prop="age"
width="160"
- > <template slot-scope="scope">
- <span v-if="scope.row.age">{{ scope.row.age }}{{scope.row.ageUnit }}</span><span v-if="scope.row.age2">{{ scope.row.age2 }}{{scope.row.ageUnit2 }}</span>
-
- </template>
- </el-table-column>
+ >
+ <template slot-scope="scope">
+ <span v-if="scope.row.age"
+ >{{ scope.row.age }}{{ scope.row.ageUnit }}</span
+ ><span v-if="scope.row.age2"
+ >{{ scope.row.age2 }}{{ scope.row.ageUnit2 }}</span
+ >
+ </template>
+ </el-table-column>
<el-table-column
label="鍑虹敓骞存湀"
align="center"
@@ -968,7 +972,7 @@
allhosp: "1",
pageSize: 10,
searchscope: 2,
- notrequiredFlag:0,
+ notrequiredFlag: 0,
tagname: "",
idcardno: undefined,
name: undefined,
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index ca5bbfb..eff5fda 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -202,7 +202,7 @@
<el-radio :label="1">鐥呭尯鍏宠仈</el-radio>
</el-radio-group>
</el-form-item> -->
- <el-row >
+ <el-row>
<el-col :span="20"
><el-form-item label="閫傜敤绉戝" prop="region">
<el-select
@@ -225,7 +225,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row >
+ <el-row>
<el-col :span="20"
><el-form-item label="閫傜敤鐥呭尯" prop="region">
<el-select
@@ -436,6 +436,7 @@
:currentList="overallCase"
:tableLabel="tableLabelhzwb"
:serialnumber="false"
+ :agenumber="true"
:searchTrue="true"
:multiplechoice="false"
:controlxz="false"
@@ -528,6 +529,7 @@
:currentList="patientuserList"
:tableLabel="tableLabelhz"
:heights="600"
+ :agenumber="true"
:serialnumber="false"
:center="false"
:typeinfo="3"
@@ -536,6 +538,8 @@
<pagination
v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6"
:total="patienttotal"
+ :page.sync="patientqueryParams.pageNum"
+ :limit.sync="patientqueryParams.pageSize"
@pagination="handleAddpatient"
/>
</div>
@@ -800,6 +804,7 @@
:serialnumber="false"
:controlsc="false"
:multiplechoice="false"
+ :agenumber="true"
:typeinfo="1"
/>
<pagination
@@ -887,7 +892,6 @@
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
{ label: "涓绘不鍖荤敓", width: "", prop: "drname" },
@@ -900,7 +904,6 @@
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
{ label: "涓绘不鍖荤敓", width: "", prop: "drname" },
@@ -1302,6 +1305,8 @@
// },
];
}
+ console.log(this.topqueryParams, "this.topqueryParams");
+
getQtemplatelist(this.topqueryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -1424,7 +1429,7 @@
},
// 棰勮
previewfnmb() {
- console.log(this.form.templateid,'this.form.templateid');
+ console.log(this.form.templateid, "this.form.templateid");
getTaskQuestioncomit(this.form.templateid).then((res) => {
if (res.code == 200) {
@@ -1501,7 +1506,6 @@
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -1515,7 +1519,6 @@
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -1677,7 +1680,6 @@
{ label: "鎮ｈ��", width: "", prop: "name" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
];
this.patientqueryParams.pageSize = 1000;
@@ -2024,10 +2026,10 @@
this.objyl.svyTaskTemplateScriptVOS =
this.objyl.svyTemplateLibScripts;
this.form.svyTaskTemplateVO = this.objyl;
- this.form.templatename=this.objyl.svyname;
+ this.form.templatename = this.objyl.svyname;
this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�");
- this.drawermb=false;
- this.previewtf=false;
+ this.drawermb = false;
+ this.previewtf = false;
});
} else {
setTimeout(() => {
--
Gitblit v1.9.3