From c4fb35392368d6b826fceddce1911fe451153986 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 27 六月 2025 15:35:45 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/QuestionnaireTask.vue | 100 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 65 insertions(+), 35 deletions(-)
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index ad1d17a..2a31d54 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
@@ -807,7 +812,7 @@
:total="total"
:page.sync="topqueryParams.pageNum"
:limit.sync="topqueryParams.pageSize"
- @pagination="Acquisitiontype"
+ @pagination="handleQuerymb"
/>
</el-row>
</div>
@@ -883,11 +888,10 @@
propstask: { value: "deptCode", label: "deptName" },
// 鎮ｈ�呰〃鍗�
tableLabelhz: [
- { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+ { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "", prop: "tag" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
{ label: "涓绘不鍖荤敓", width: "", prop: "drname" },
@@ -896,11 +900,10 @@
],
// 鎮ｈ�呰〃鍗�
tableLabelhzwb: [
- { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
+ { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "sfzh" },
+ { 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" },
@@ -955,6 +958,8 @@
topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
leavehospitaldistrictcodes: [],
leaveldeptcodes: [],
+ hospitaldistrictcodes: [],
+ deptcodes: [],
},
topicoptions: [{ children: [{ children: [] }] }],
showSearch: true, //
@@ -1028,7 +1033,7 @@
templateid: null,
libtemplateid: null,
kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹ｆ暀璧勮銆�",
- jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹ｆ暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
+ jsy: "鎰熻阿鎮ㄥ弬涓庢湰娆￠殢璁裤�傛偍鐨勫弽棣堝府鍔╂垜浠洿濂藉湴浜嗚В瀹濆疂鐨勯�傚簲鎯呭喌锛屽苟涓烘偍鎻愪緵鏇寸簿鍑嗙殑鎶ょ悊寤鸿涓庡仴搴锋寚瀵笺�傜鎮ㄥ拰瀹濆疂鍋ュ悍蹇箰銆�",
},
taskoptions: [
{
@@ -1302,6 +1307,8 @@
// },
];
}
+ console.log(this.topqueryParams, "this.topqueryParams");
+
getQtemplatelist(this.topqueryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -1424,10 +1431,13 @@
},
// 棰勮
previewfnmb() {
+ console.log(this.form.templateid, "this.form.templateid");
+
getTaskQuestioncomit(this.form.templateid).then((res) => {
if (res.code == 200) {
- console.log(res, "棰勮鏁版嵁");
this.objyl = res.data;
+ console.log(this.objyl, "棰勮鏁版嵁");
+
if (this.objyl.suitway)
this.objyl.suitway = this.objyl.suitway.split(",");
@@ -1488,17 +1498,16 @@
this.allpids.push(item.patid);
});
if (
- this.patientqueryParams.allhosp == 1 ||
(this.patientqueryParams.allhosp == 1 &&
- this.patientqueryParams.cry == 1)
+ !this.patientqueryParams.zsallhosp) ||
+ this.patientqueryParams.zsallhosp == 1
) {
this.tableLabelhz = [
// { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
- { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
+ { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -1506,13 +1515,15 @@
{ label: "绉戝", width: "180", prop: "dept" },
{ label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
];
- } else if (this.patientqueryParams.allhosp == 4) {
+ } else if (
+ this.patientqueryParams.allhosp == 4 ||
+ this.patientqueryParams.zsallhosp == 4
+ ) {
this.tableLabelhz = [
{ label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鎮ｈ�呮爣绛�", width: "200", prop: "tag" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
{ label: "璐ｄ换鎶ゅ＋", width: "", prop: "nurseName" },
@@ -1526,14 +1537,8 @@
} else {
this.patientqueryParams.pids = null;
}
- // 绫诲瀷鍒ゆ柇
- if (this.patientqueryParams.allhosp == 1) {
- this.patientqueryParams.cry = 1;
- } else if (this.patientqueryParams.allhosp == 4) {
- this.patientqueryParams.cry = 0;
- this.patientqueryParams.allhosp = "1";
- }
- // 鏉ユ簮鍒ゆ柇
+
+ // 绉戝杩樻槸鐥呭尯
if (this.patientqueryParams.searchscope == 1) {
this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
@@ -1551,6 +1556,31 @@
this.patientqueryParams.leavehospitaldistrictcodes =
store.getters.belongWards.map((obj) => obj.districtCode);
}
+ // 鍑洪櫌杩樻槸鍏ラ櫌
+ if (
+ (this.patientqueryParams.allhosp == 1 &&
+ !this.patientqueryParams.zsallhosp) ||
+ this.patientqueryParams.zsallhosp == 1
+ ) {
+ this.patientqueryParams.cry = 1;
+ this.patientqueryParams.hospitaldistrictcodes = [];
+ this.patientqueryParams.deptcodes = [];
+ this.patientqueryParams.zsallhosp = "1";
+ } else if (
+ this.patientqueryParams.allhosp == 4 ||
+ this.patientqueryParams.zsallhosp == 4
+ ) {
+ this.patientqueryParams.deptcodes =
+ this.patientqueryParams.leaveldeptcodes;
+ this.patientqueryParams.hospitaldistrictcodes =
+ this.patientqueryParams.leavehospitaldistrictcodes;
+ this.patientqueryParams.leavehospitaldistrictcodes = [];
+ this.patientqueryParams.leaveldeptcodes = [];
+ this.patientqueryParams.cry = 0;
+ this.patientqueryParams.allhosp = "1";
+ this.patientqueryParams.zsallhosp = "4";
+ }
+
getTaskpatientQC(this.patientqueryParams).then((response) => {
this.patientuserList = response.rows;
this.patientuserList.forEach((item) => {
@@ -1579,11 +1609,11 @@
item.isoperation = 1;
item.patid = item.id;
item.hospType = this.patientqueryParams.allhosp;
- item.sfzh = item.idcardno;
+ item.sfzh = item.patientno;
item.deptCode = item.deptcode;
item.deptName = item.dept;
item.admindate = item.inhosptime;
- item.sfzh = item.idcardno;
+ item.sfzh = item.patientno;
if (this.patientqueryParams.allhosp == 6) {
item.patfrom = 1;
}
@@ -1666,15 +1696,15 @@
!this.patientqueryParams.leaveldeptcodes[0]
)
this.patientqueryParams.leaveldeptcodes = null;
+ console.log(this.patientqueryParams.allhosp, "bbblll");
this.handleAddpatient();
},
// 鑾峰彇澶栭儴鎮ｈ�呭鍏ュ垪琛�
Externallist() {
this.tableLabelhz = [
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "韬唤璇�", width: "200", prop: "idcardno" },
+ { label: "鎮ｈ�呯紪鍙�", width: "200", prop: "patientno" },
{ label: "鎬у埆", width: "", prop: "sex" },
- { label: "骞撮緞", width: "", prop: "age" },
{ label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
];
this.patientqueryParams.pageSize = 1000;
@@ -1725,7 +1755,7 @@
templateid: null,
libtemplateid: null,
kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
- jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
+ jsy: "鎰熻阿鎮ㄥ弬涓庢湰娆￠殢璁裤�傛偍鐨勫弽棣堝府鍔╂垜浠洿濂藉湴浜嗚В瀹濆疂鐨勯�傚簲鎯呭喌锛屽苟涓烘偍鎻愪緵鏇寸簿鍑嗙殑鎶ょ悊寤鸿涓庡仴搴锋寚瀵笺�傜鎮ㄥ拰瀹濆疂鍋ュ悍蹇箰銆�",
};
this.questionList = [];
@@ -2021,10 +2051,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