From a99e82da2b087d7019cdce015c25befc620b9d61 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 10 十一月 2026 14:14:16 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/mzsatisfaction/index.vue | 8 ++
vue.config.js | 1
src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue | 26 +++-----
随访适用11.10.zip | 0
src/views/patient/propaganda/particty.vue | 38 ++++++++++--
随访使用11.10.zip | 0
src/views/followvisit/zysatisfaction/index.vue | 8 ++
src/views/patient/propaganda/QuestionnaireTask.vue | 47 ++++++++++++---
8 files changed, 97 insertions(+), 31 deletions(-)
diff --git a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
index 92cd112..1e51627 100644
--- a/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
+++ b/src/views/Satisfaction/sfstatistics/components/FollowupStatistics.vue
@@ -567,6 +567,7 @@
this.options = (this.$store.getters.tasktypes || []).map((o) =>
labelFix[o.label] ? { ...o, label: labelFix[o.label] } : o
);
+ console.log(11, this.options);
// 鑾峰彇绉戝鍒楄〃
this.flatArraydept = (this.$store.getters.belongDepts || []).map(
@@ -671,7 +672,10 @@
}
},
sortChineseNumber(aRow, bRow) {
- return this.compareWardNames(this.getWardName(aRow), this.getWardName(bRow));
+ return this.compareWardNames(
+ this.getWardName(aRow),
+ this.getWardName(bRow)
+ );
},
sortHospitalWard(aRow, bRow) {
return this.compareWardNames(
@@ -984,9 +988,7 @@
// 鐥呭尯缁熻锛堝惈缁熻绫诲瀷涓虹┖鐨勬儏鍐碉級
if (this.queryParams.statisticaltype != 2) {
const rawSelected = this.queryParams.leavehospitaldistrictcodes || [];
- const selected = rawSelected.filter(
- (code) => code && code !== "all"
- );
+ const selected = rawSelected.filter((code) => code && code !== "all");
const useAll = !rawSelected.length || rawSelected.includes("all");
if (!useAll && selected.length) {
@@ -1142,8 +1144,7 @@
buildCompletedMeta() {
return {
- dimension:
- this.queryParams.statisticaltype == 2 ? "dept" : "ward",
+ dimension: this.queryParams.statisticaltype == 2 ? "dept" : "ward",
scope: this.satisfactionScope,
dateRange: [...(this.queryParams.dateRange || [])],
};
@@ -1151,24 +1152,20 @@
// 鎸夊綋鍓嶇粺璁＄被鍨嬪垎缁勶細鐥呭尯缁熻 -> 鐥呭尯锛岀瀹ょ粺璁� -> 绉戝
groupCompletedRows(rows) {
- const dimension =
- this.queryParams.statisticaltype == 2 ? "dept" : "ward";
+ const dimension = this.queryParams.statisticaltype == 2 ? "dept" : "ward";
const groupMap = new Map();
(rows || []).forEach((row) => {
const name =
dimension === "ward" ? this.wardNameOf(row) : this.deptNameOf(row);
const code =
- dimension === "ward"
- ? this.wardCodeOf(row)
- : this.deptCodeOf(row);
+ dimension === "ward" ? this.wardCodeOf(row) : this.deptCodeOf(row);
const key = String(code || name || "unknown");
if (!groupMap.has(key)) {
groupMap.set(key, {
key,
- label:
- name || (dimension === "ward" ? "鏈垎鐥呭尯" : "鏈垎绉戝"),
+ label: name || (dimension === "ward" ? "鏈垎鐥呭尯" : "鏈垎绉戝"),
rows: [],
});
}
@@ -1193,8 +1190,7 @@
const orderMap = new Map();
(list || []).forEach((item, index) => {
- const code =
- dimension === "ward" ? item.districtCode : item.deptCode;
+ const code = dimension === "ward" ? item.districtCode : item.deptCode;
if (code) orderMap.set(String(code), index);
});
diff --git a/src/views/followvisit/mzsatisfaction/index.vue b/src/views/followvisit/mzsatisfaction/index.vue
index ddb0e30..09bc0a7 100644
--- a/src/views/followvisit/mzsatisfaction/index.vue
+++ b/src/views/followvisit/mzsatisfaction/index.vue
@@ -376,6 +376,14 @@
width="120"
>
</el-table-column>
+ <el-table-column
+ v-if="isTongdeCampus"
+ label="鐐逛綅缂栫爜"
+ width="120"
+ align="center"
+ key="pointLocation"
+ prop="pointLocation"
+ />
<el-table-column
label="澶勭悊浜哄憳"
diff --git a/src/views/followvisit/zysatisfaction/index.vue b/src/views/followvisit/zysatisfaction/index.vue
index 6e8b081..3ff55b7 100644
--- a/src/views/followvisit/zysatisfaction/index.vue
+++ b/src/views/followvisit/zysatisfaction/index.vue
@@ -407,6 +407,14 @@
{{ wardNameOf(scope.row) }}
</template>
</el-table-column>
+ <el-table-column
+ v-if="isTongdeCampus"
+ label="鐐逛綅缂栫爜"
+ width="120"
+ align="center"
+ key="pointLocation"
+ prop="pointLocation"
+ />
<el-table-column
label="澶勭悊浜哄憳"
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 1cea8bc..d54357c 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -70,6 +70,19 @@
/>
</el-form-item>
+ <el-form-item
+ label="鐐逛綅缂栫爜"
+ v-if="
+ isTongdeCampus && (serviceType == 6 || serviceType == 14)
+ "
+ >
+ <el-input
+ style="width: 220px"
+ v-model="form.pointLocation"
+ placeholder="璇疯緭鍏ョ偣浣嶇紪鐮�"
+ />
+ </el-form-item>
+
<el-form-item label="鏈嶅姟褰㈠紡">
<SortCheckbox
v-model="checkList"
@@ -333,7 +346,9 @@
</el-row>
<!-- 缂欎簯鍘夸汉姘戝尰闄細瓒呮椂鏈畬鎴愭槸鍚﹀啀娆￠殢璁� / 鍐嶆闅忚鍏宠仈浠诲姟 -->
- <el-row v-if="form.appltype == 1 && orgname == '缂欎簯鍘夸汉姘戝尰闄�'">
+ <el-row
+ v-if="form.appltype == 1 && orgname == '缂欎簯鍘夸汉姘戝尰闄�'"
+ >
<el-col :span="12">
<el-form-item label="瓒呮椂鏈畬鎴愭槸鍚﹀啀娆￠殢璁�">
<el-radio-group v-model="form.nexttaskflag">
@@ -1691,6 +1706,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ pointLocation: "",
kcb:
"浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸" +
localStorage.getItem("orgname") +
@@ -1711,14 +1727,6 @@
detailList: [],
},
},
- taskoptions: [
- { value: "4", label: "鍑洪櫌鐥呬汉" },
- { value: "1", label: "鍦ㄩ櫌鐥呬汉" },
- { value: "2", label: "闂ㄨ瘖鐥呬汉" },
- { value: "3", label: "浣撴鐥呬汉" },
- { value: "6", label: "闄㈠鎮ｈ��" },
- { value: "5", label: "鎵嬫湳鐥呬汉" },
- ],
source: [
{ value: 0, label: "鎵�灞炴偅鑰�" },
{ value: 1, label: "绉戝鎮ｈ��" },
@@ -1802,6 +1810,26 @@
},
remaining() {
return this.illnesslist.length - 10;
+ },
+ // 鎮ｈ�呯被鍨嬩笅鎷夛紙鏂板绫诲瀷锛夛細鎸変换鍔＄被鍨嬮檺鍒跺彲閫夎寖鍥�
+ taskoptions() {
+ const options = [
+ { value: "4", label: "鍑洪櫌鐥呬汉" },
+ { value: "1", label: "鍦ㄩ櫌鐥呬汉" },
+ { value: "2", label: "闂ㄨ瘖鐥呬汉" },
+ { value: "3", label: "浣撴鐥呬汉" },
+ { value: "6", label: "闄㈠鎮ｈ��" },
+ { value: "5", label: "鎵嬫湳鐥呬汉" },
+ ];
+ // 鍑洪櫌闅忚锛坰erviceType=2锛夛細鍙兘閫夋嫨鍦ㄩ櫌鎮ｈ��
+ if (this.serviceType == 2) {
+ return options.filter((item) => item.value == "1");
+ }
+ // 鍏ラ櫌闅忚锛坰erviceType=18锛夛細涓嶅彲閫夋嫨鍑洪櫌鎮ｈ��
+ if (this.serviceType == 18) {
+ return options.filter((item) => item.value != "4");
+ }
+ return options;
},
},
methods: {
@@ -1937,6 +1965,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ pointLocation: "",
kcb:
"浜茬埍鐨勬偅鑰�/瀹跺睘锛屾垜浠槸" +
localStorage.getItem("orgname") +
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index c8887a6..3c23bf2 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -70,6 +70,14 @@
/>
</el-form-item>
+ <el-form-item label="鐐逛綅缂栫爜" v-if="isTongdeCampus&& (serviceType == 6 || serviceType == 14)">
+ <el-input
+ style="width: 220px"
+ v-model="form.pointLocation"
+ placeholder="璇疯緭鍏ョ偣浣嶇紪鐮�"
+ />
+ </el-form-item>
+
<el-form-item label="鏈嶅姟褰㈠紡">
<SortCheckbox
v-model="checkList"
@@ -1702,6 +1710,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ pointLocation: "",
kcb:
"浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�" +
localStorage.getItem("orgname") +
@@ -1722,13 +1731,6 @@
detailList: [],
},
},
- taskoptions: [
- { value: "4", label: "鍑洪櫌鐥呬汉" },
- { value: "1", label: "鍦ㄩ櫌鐥呬汉" },
- { value: "2", label: "闂ㄨ瘖鐥呬汉" },
- { value: "3", label: "浣撴鐥呬汉" },
- { value: "5", label: "鎵嬫湳鐥呬汉" },
- ],
source: [
{ value: 0, label: "鎵�灞炴偅鑰�" },
{ value: 1, label: "绉戝鎮ｈ��" },
@@ -1813,6 +1815,27 @@
this.Getdetails();
this.getFollowupclassify();
}
+ },
+ computed: {
+ // 鎮ｈ�呯被鍨嬩笅鎷夛紙鏂板绫诲瀷锛夛細鎸変换鍔＄被鍨嬮檺鍒跺彲閫夎寖鍥�
+ taskoptions() {
+ const options = [
+ { value: "4", label: "鍑洪櫌鐥呬汉" },
+ { value: "1", label: "鍦ㄩ櫌鐥呬汉" },
+ { value: "2", label: "闂ㄨ瘖鐥呬汉" },
+ { value: "3", label: "浣撴鐥呬汉" },
+ { value: "5", label: "鎵嬫湳鐥呬汉" },
+ ];
+ // 鍑洪櫌闅忚锛坰erviceType=2锛夛細鍙兘閫夋嫨鍦ㄩ櫌鎮ｈ��
+ if (this.serviceType == 2) {
+ return options.filter((item) => item.value == "1");
+ }
+ // 鍏ラ櫌闅忚锛坰erviceType=18锛夛細涓嶅彲閫夋嫨鍑洪櫌鎮ｈ��
+ if (this.serviceType == 18) {
+ return options.filter((item) => item.value != "4");
+ }
+ return options;
+ },
},
methods: {
// ---------- 宸ュ叿鏂规硶 ----------
@@ -1961,6 +1984,7 @@
templatename: "",
templateid: null,
libtemplateid: null,
+ pointLocation: "",
kcb:
"浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄�" +
localStorage.getItem("orgname") +
diff --git a/vue.config.js b/vue.config.js
index a652c83..21ebdfa 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,6 +41,7 @@
// target: `http://192.168.100.10:8095`,//鏂板崕
// target: `http://192.168.100.10:8098`,//甯備竴
// target:`http://localhost:8095`,
+ // target: `http://192.168.100.168:8095`,
// target:`http://35z1t16164.qicp.vip`,
// target: `http://192.168.100.172:8095`,
// target: `http://192.168.100.10:8089`,//鍗楀崕
diff --git "a/\351\232\217\350\256\277\344\275\277\347\224\25011.10.zip" "b/\351\232\217\350\256\277\344\275\277\347\224\25011.10.zip"
new file mode 100644
index 0000000..44ce0ff
--- /dev/null
+++ "b/\351\232\217\350\256\277\344\275\277\347\224\25011.10.zip"
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\202\347\224\25011.10.zip" "b/\351\232\217\350\256\277\351\200\202\347\224\25011.10.zip"
new file mode 100644
index 0000000..c9baa53
--- /dev/null
+++ "b/\351\232\217\350\256\277\351\200\202\347\224\25011.10.zip"
Binary files differ
--
Gitblit v1.9.3