From 5e1745487b290612c6282006822b431843a081af Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 15 五月 2025 14:49:36 +0800
Subject: [PATCH] 测试完成
---
vue.config.js | 2
src/views/followvisit/record/detailpage/index.vue | 56 +++++++-------
src/views/patient/patient/hospital.vue | 8 +
src/views/patient/patient/behospitalized.vue | 21 +++--
src/views/followvisit/record/index.vue | 24 ++++--
src/views/followvisit/discharge/index.vue | 25 +++---
src/views/patient/follow/index.vue | 9 +
src/views/patient/propaganda/QuestionnaireTask.vue | 62 ++++++++++-----
8 files changed, 126 insertions(+), 81 deletions(-)
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index cde20d4..782c16d 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -327,13 +327,7 @@
/>
</template>
</el-table-column>
- <el-table-column
- label="闅忚浜哄憳"
- align="center"
- key="updateBy"
- prop="updateBy"
- width="120"
- />
+
<el-table-column
label="闅忚瀹屾垚鏃堕棿"
sortable
@@ -373,6 +367,13 @@
align="center"
key="drname"
prop="drname"
+ />
+ <el-table-column
+ label="闅忚浜哄憳"
+ align="center"
+ key="updateBy"
+ prop="updateBy"
+ width="120"
/>
<el-table-column
label="鍑洪櫌澶╂暟"
@@ -436,15 +437,15 @@
>
</el-table-column>
- <!-- <el-table-column
- label="鐤剧梾鍚嶇О"
+ <el-table-column
+ label="璇婃柇鍚嶇О"
align="center"
- key="icdName"
- prop="icdName"
+ key="leavediagname"
+ prop="leavediagname"
width="120"
:show-overflow-tooltip="true"
>
- </el-table-column> -->
+ </el-table-column>
<el-table-column
label="鍑洪櫌闅忚妯℃澘鍚嶇О"
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 8febf3d..286c174 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -15,7 +15,7 @@
>鏌ョ湅鎮ｈ�呭叏閮ㄦ湇鍔�</el-button
>
<el-button v-else type="success" @click="getTaskservelist(id)"
- >鏌ョ湅鎮ｈ�呮湰娆℃湇鍔′俊鎭�</el-button
+ >鍙睍绀烘湰娆℃湇鍔′俊鎭�</el-button
>
</div>
<div style="margin-left: 20px; color: #59a0f0">
@@ -32,7 +32,7 @@
</div>
</div>
<div>
- <el-table :data="logsheetlist" style="width: 100%">
+ <el-table :data="logsheetlist" :row-class-name="tableRowClassName" style="width: 100%">
<el-table-column
prop="sendname"
align="center"
@@ -200,7 +200,6 @@
size="medium"
type="text"
@click="Seedetails(scope.row)"
- v-hasPermi="['system:user:edit']"
><span class="button-zx"
><i class="el-icon-s-order"></i>鏌ョ湅</span
></el-button
@@ -677,6 +676,7 @@
activeName: "wj",
voice: "",
templateid: "",
+ again:'',
zcform: {},
form: {},
tableDatatop: [], //棰樼洰琛�
@@ -749,7 +749,7 @@
}]
},
userform: {},
- Whetherall: false, //鏄惁鍏ㄩ儴璁板綍灞曠ず
+ Whetherall: true, //鏄惁鍏ㄩ儴璁板綍灞曠ず
dialogFormVisible: false,
Voicetype: 0, //鏄惁涓鸿闊虫湇鍔�
logsheetlist: [],
@@ -767,11 +767,11 @@
this.id = this.$route.query.id;
this.sendname = this.$route.query.sendname;
this.patid = this.$route.query.patid;
+ this.again = this.$route.query.again;
this.Voicetype = this.$route.query.Voicetype;
this.serviceType = this.$route.query.serviceType;
- console.log(this.id, this.patid);
- this.getTaskservelist(this.id);
+ this.getTaskservelist();
},
methods: {
@@ -784,7 +784,11 @@
isFinish: false,
}).then((res) => {
if (res.code === 200) {
- this.tableDatatop = res.data.scriptResult;
+ if (this.again&&res.data.upScriptResult) {
+ this.tableDatatop = res.data.upScriptResult;
+ }else{
+ this.tableDatatop = res.data.scriptResult;
+ }
this.tableDatatop.forEach((item) => {
if (item.scriptType == 2) item.scriptResult = [];
if (item.scriptResult && item.scriptType != 2) {
@@ -845,10 +849,8 @@
patid: this.patid,
subId: id ? id : this.id,
};
- console.log(this.voiceDatatop, "111");
getPersonVoices(obj).then((res) => {
- console.log("222");
if (res.code == 200) {
this.voiceDatatop = res.data.serviceSubtaskDetails;
this.voice = res.data.voice;
@@ -863,7 +865,6 @@
item.scriptResult = [];
}
});
- console.log(this.tableDatatop, "this.tableDatatop");
if (!this.tableDatatop.length) {
this.puttaskid(this.templateid);
@@ -892,7 +893,6 @@
item.scriptResult = [];
}
});
- console.log(this.tableDatatop, "this.tableDatatop");
}
});
},
@@ -960,7 +960,6 @@
},
yuyingetdetail() {
this.tableDatatop.forEach((item, index) => {
- console.log(item.scriptResult, "scriptResult");
item.scriptResult = item.scriptResult.join("&");
item.templatequestionnum = index + 1;
item.subId = this.id;
@@ -997,8 +996,6 @@
// 鑾峰彇鎮ｈ�呰褰�
getTaskservelist(id) {
- console.log(id, "idsub");
-
if (id) {
this.Whetherall = false;
} else {
@@ -1010,7 +1007,7 @@
subId: id,
}).then((res) => {
if (res.code == 200) {
- this.form = res.rows[0].serviceSubtaskList[0];
+ this.form = res.rows[0].serviceSubtaskList.find(item => item.id == this.id);
this.logsheetlist = res.rows[0].serviceSubtaskList;
this.templateid = this.logsheetlist[0].templateid;
const targetDate = new Date(this.form.longSendTime); // 鐩爣鏃ユ湡
@@ -1027,8 +1024,6 @@
}
this.getuserinfo();
}
- console.log(this.Voicetype, "this.Voicetype");
-
if (this.Voicetype) {
this.getPersonVoices();
} else {
@@ -1048,14 +1043,13 @@
Editsingletaskson(objson).then((res) => {
if (res.code) {
this.$modal.msgSuccess("鏈嶅姟璁板綍鎴愬姛");
- this.getTaskservelist(this.id);
+ this.getTaskservelist();
}
});
}
});
},
Editsingletasksonyic(sendstate) {
- console.log(sendstate, "sendstate");
let objson = {};
getTaskservelist({
@@ -1063,7 +1057,7 @@
subId: this.id,
}).then((res) => {
if (res.code == 200) {
- objson = res.rows[0].serviceSubtaskList[0];
+ objson = res.rows[0].serviceSubtaskList.find(item => item.id == this.id);
objson.remark = this.form.remark;
if (sendstate) objson.sendstate = sendstate;
Editsingletaskson(objson).then((res) => {
@@ -1076,11 +1070,18 @@
this.$modal.msgError("鍩虹淇℃伅淇敼澶辫触");
}
});
- this.getTaskservelist(this.id);
+ this.getTaskservelist();
}
});
}
});
+ },
+ // 寮傚父鍒楁覆鏌�
+ tableRowClassName({ row, rowIndex }) {
+ if (row.id == this.id) {
+ return "warning-row";
+ }
+ return "";
},
// 璋冭捣鍐嶆鍙戦��
sendAgain() {
@@ -1098,18 +1099,16 @@
this.Voicetype = 1;
}
}
- console.log(this.Voicetype, "this.Voicetype");
-
this.taskid = row.taskid;
this.id = row.id;
this.patid = row.patid;
this.serviceType = row.serviceType;
- this.getTaskservelist(this.id);
+ this.getTaskservelist();
})
.catch(() => {});
},
handleOptionChange(a, b, c) {
- console.log(this.tableDatatop[b], "this.tableDatatop[b]");
+console.log(a);
if (this.Voicetype) {
var obj = this.tableDatatop[b].ivrTaskScriptTargetoptionList.find(
@@ -1193,9 +1192,7 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
updateScore(a, b, c) {
- console.log(a);
- console.log(b);
- console.log(c);
+
},
},
};
@@ -1225,6 +1222,9 @@
}
}
}
+::v-deep.el-table .warning-row {
+ background: #c4e2ee;
+}
.Followuserinfos {
margin: 20px 10px;
align-items: center;
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index c70694d..50b0605 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -165,7 +165,6 @@
icon="el-icon-upload2"
size="medium"
@click="handleExport"
- v-hasPermi="['system:user:export']"
>瀵煎嚭</el-button
>
</div>
@@ -508,7 +507,7 @@
></el-button
>
</el-tooltip> -->
- <el-tooltip
+ <!-- <el-tooltip
v-if="scope.row.sendstate == 1 || scope.row.sendstate == 2"
class="item"
effect="dark"
@@ -524,7 +523,7 @@
><i class="el-icon-remove-outline"></i>鏆傚仠鏈嶅姟</span
></el-button
>
- </el-tooltip>
+ </el-tooltip> -->
<el-button size="medium" type="text" @click="Seedetails(scope.row)"
><span class="button-zx"
><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
@@ -908,6 +907,10 @@
topicoptions: [
{
+ value: null,
+ label: "鍏ㄩ儴",
+ },
+ {
value: 1,
label: "琛ㄥ崟宸查鍙�",
},
@@ -1067,11 +1070,11 @@
});
},
//鎮ｈ��360璺宠浆
- gettoken360(sfzh,drcode,drname) {
+ gettoken360(sfzh, drcode, drname) {
this.postData.YeWuXX.BingRenXX.ZhengJianHM = sfzh;
- if (this.postData.XiaoXiTou.ZuHuMC=='涓芥按甯備腑鍖婚櫌') {
- this.postData.YeWuXX.YongHuXX.YongHuID = '1400398571877961728';
- this.postData.YeWuXX.YongHuXX.YongHuXM = 'LSZYY';
+ if (this.postData.XiaoXiTou.ZuHuMC == "涓芥按甯備腑鍖婚櫌") {
+ this.postData.YeWuXX.YongHuXX.YongHuID = "1400398571877961728";
+ this.postData.YeWuXX.YongHuXX.YongHuXM = "LSZYY";
}
query360PatInfo(this.postData).then((res) => {
if (res.data.url) {
@@ -1244,6 +1247,9 @@
sort: 2,
searchscope: 2,
sendstate: 2,
+ scopetype: [],
+ leaveldeptcodes: [],
+ leavehospitaldistrictcodes: [],
};
this.handleQuery(1);
},
@@ -1395,6 +1401,7 @@
patid: row.patid,
id: row.id,
Voicetype: type,
+ again: 1,
},
});
},
@@ -1448,7 +1455,8 @@
this.topqueryParams.pageNum = null;
this.topqueryParams.pageSize = null;
this.download(
- "smartor/serviceSubtask/export",
+ // "smartor/serviceSubtask/export",
+ "smartor/serviceSubtask/patItemExport",
{
...this.topqueryParams,
},
diff --git a/src/views/patient/follow/index.vue b/src/views/patient/follow/index.vue
index 3ce1f0e..6c7d903 100644
--- a/src/views/patient/follow/index.vue
+++ b/src/views/patient/follow/index.vue
@@ -437,9 +437,12 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.dateRange = [];
- this.resetForm("queryForm");
- this.$refs.tree.setCurrentKey(null);
+ this.queryParams={
+ pageNum: 1,
+ pageSize: 10,
+ allhosp: "1",
+ notrequiredFlag: 1,
+ },
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index d5af2eb..d7700f7 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -618,9 +618,6 @@
},
},
created() {
- this.getList();
- this.listDept();
- this.gettabList();
this.sourcetype[0].children = store.getters.belongDepts.map((dept) => {
return {
label: dept.deptName,
@@ -633,6 +630,15 @@
value: dept.districtCode,
};
});
+ this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.queryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(
+ (obj) => obj.districtCode
+ );
+ this.getList();
+ this.listDept();
+ this.gettabList();
},
methods: {
/** 鏌ヨ鎮ｈ�呭垪琛� */
@@ -748,13 +754,12 @@
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
-
if (this.dateRange) {
this.queryParams.startInHospTime = this.dateRange[0];
this.queryParams.endInHospTime = this.dateRange[1];
- }else{
- this.queryParams.startInHospTime = '';
- this.queryParams.endInHospTime = '';
+ } else {
+ this.queryParams.startInHospTime = "";
+ this.queryParams.endInHospTime = "";
}
this.queryParams.pageNum = 1;
this.getList();
@@ -772,7 +777,7 @@
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
};
- this.handleQuery();
+ this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 8bc58fd..80ce156 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -607,6 +607,12 @@
value: dept.districtCode,
};
});
+ this.queryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.queryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(
+ (obj) => obj.districtCode
+ );
this.getList();
this.listDept();
this.gettabList();
@@ -749,7 +755,7 @@
leaveldeptcodes: [],
leavehospitaldistrictcodes: [],
};
- this.handleQuery();
+ this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index c55859c..651b294 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -364,7 +364,7 @@
placeholder="璇风偣鍑诲彸渚ч�夋嫨"
/>
<el-button
- v-if="
+ v-if="
(form.templateid && form.sendState == 1) ||
!form.templateid
"
@@ -598,7 +598,7 @@
v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6"
:total="patienttotal"
:page.sync="patientqueryParams.pageNum"
- :limit.sync="patientqueryParams.pageSize"
+ :limit.sync="patientqueryParams.pageSize"
@pagination="handleAddpatient"
/>
</div>
@@ -778,6 +778,21 @@
>淇濆瓨浣跨敤</el-button
>
</span>
+ <!-- <span slot="footer" class="dialog-footer">
+ <el-button
+ v-if="(form.templateid && form.sendState == 1) || !form.templateid"
+ type="primary"
+ @click="Departmenttreatment"
+ >{{ form.templateid ? "鏇挎崲浣跨敤" : "閫夋嫨浣跨敤" }}</el-button
+ >
+ <el-button
+ :type="previewtftype ? 'success' : 'warning'"
+ @click="previewGo"
+ >{{
+ previewtftype ? "鍓嶅線淇敼宸查�夋嫨妯℃澘" : "鏂板淇濆瓨骞跺墠寰�淇敼"
+ }}</el-button
+ >
+ </span> -->
</el-dialog>
<el-drawer
title="闂嵎鍐呭鍒楄〃"
@@ -916,6 +931,7 @@
previewtf: false, //棰勮
loading: false, // 閬僵灞�
patientloading: false, // 閬僵灞�
+ previewtftype: 0, //棰勮鎯呭喌0鏂版ā鏉块瑙�1宸查�夋嫨妯℃澘淇敼
dialogVisiblepatient: false, //娣诲姞鎮ｈ�呭脊妗�
dialogVisiblepatientjb: false, //娣诲姞鐤剧梾寮规
deptcodesWards: [], //绉戝鏁版嵁
@@ -955,7 +971,7 @@
tableLabelhzwb: [
{ label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
+ { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "diagname" },
{ label: "韬唤璇�", width: "200", prop: "sfzh" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
@@ -1134,51 +1150,51 @@
tasktypes: [
{
- value: "1",
+ value: 1,
label: "鐩戞祴璇勪及",
},
{
- value: "2",
+ value: 2,
label: "鍑洪櫌闅忚",
},
{
- value: "3",
+ value: 3,
label: "闂ㄨ瘖闅忚",
},
{
- value: "4",
+ value: 4,
label: "瀹ｆ暀鍏虫��",
},
{
- value: "5",
+ value: 5,
label: "澶嶈瘖绠＄悊",
},
// {
- // value: "5",
+ // value: 5,
// label: "婊℃剰搴﹁皟鏌�",
// },
{
- value: "7",
+ value: 7,
label: "鎮ｈ�呮姤鍛�",
},
// {
- // value: "8",
+ // value: 8,
// label: "鍏朵粬閫氱煡",
// },
{
- value: "9",
+ value: 9,
label: "浣撴闅忚",
},
// {
- // value: "10",
+ // value: 1",
// label: "鍖绘妧闅忚",
// },
{
- value: "11",
+ value: 11,
label: "褰卞儚闅忚",
},
{
- value: "12",
+ value: 12,
label: "蹇冪數闅忚",
},
// {
@@ -1582,6 +1598,7 @@
this.questionList.forEach((item) => {
item.qremark = [];
});
+ this.previewtftype = 1;
this.objyl.svyTemplateLibScripts =
res.rows[0].svyTemplateLibScripts;
}
@@ -1679,7 +1696,7 @@
// { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
{ label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
+ { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
@@ -1693,7 +1710,7 @@
this.tableLabelhz = [
{ label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
{ label: "鎮ｈ��", width: "", prop: "name" },
- { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
+ { label: "鎮ｈ�呰瘖鏂�", width: "", prop: "leavediagname" },
{ label: "韬唤璇�", width: "200", prop: "idcardno" },
{ label: "鎬у埆", width: "", prop: "sex" },
{ label: "骞撮緞", width: "", prop: "age" },
@@ -1766,6 +1783,7 @@
item.deptCode = item.deptcode;
item.deptName = item.dept;
item.admindate = item.inhosptime;
+ item.diagname = item.leavediagname;
item.sfzh = item.idcardno;
if (this.patientqueryParams.allhosp == 6) {
item.patfrom = 1;
@@ -2179,9 +2197,13 @@
},
// 鏌ョ湅妯℃澘
previewGo() {
- this.$router.push({
- path: "/knowledge/tpuconfigurat/",
- query: { id: this.previewid, task: true, data: this.form },
+ this.$modal.confirm("鏄惁鍓嶅線淇敼浠诲姟妯℃澘璇︾粏鍐呭锛�").then(() => {
+ this.drawermb = false; //閫夋嫨妯℃澘寮圭獥
+ this.previewtf = false; //棰勮
+ this.$router.push({
+ path: "/knowledge/tpuconfigurat/",
+ query: { id: this.previewid, task: true, data: this.form },
+ });
});
},
// 淇濆瓨/鏇存柊浠诲姟妯℃澘
diff --git a/vue.config.js b/vue.config.js
index eb6d629..ed49b75 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://192.168.68.111:8095`,
+ // target: `https://www.health-y.cn/lssf`,
// target: `http://10.202.20.185:8095`,
// target: `http://9.208.2.190:8095`,
target:`http://localhost:8095`,
--
Gitblit v1.9.3