From dacfc42199eaeed64738201411d0b37153f7bf76 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 12 十一月 2025 15:02:01 +0800
Subject: [PATCH] 测试完成
---
/dev/null | 0
sltd-zs.zip | 0
src/store/modules/user.js | 6 +
src/views/followvisit/record/detailpage/index.vue | 15 +--
src/views/sfstatistics/percentage/index.vue | 15 +++
SLTD-WL.zip | 0
src/views/knowledge/questionnaire/compilequer/index.vue | 19 ++--
src/views/patient/propaganda/Missioncreation.vue | 17 +++-
src/views/outsideChainwtnew.vue | 123 ++++++++++++++++++++++--------
9 files changed, 138 insertions(+), 57 deletions(-)
diff --git a/LiShui.zip b/LiShui.zip
deleted file mode 100644
index 61591dc..0000000
--- a/LiShui.zip
+++ /dev/null
Binary files differ
diff --git a/SLTD-WL.zip b/SLTD-WL.zip
index 38e8b0b..3ef20a5 100644
--- a/SLTD-WL.zip
+++ b/SLTD-WL.zip
Binary files differ
diff --git a/SLTD.zip b/SLTD.zip
deleted file mode 100644
index 925b3a5..0000000
--- a/SLTD.zip
+++ /dev/null
Binary files differ
diff --git a/dist.zip b/sltd-zs.zip
similarity index 92%
rename from dist.zip
rename to sltd-zs.zip
index f7a4b68..c49b570 100644
--- a/dist.zip
+++ b/sltd-zs.zip
Binary files differ
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e251f20..19ad61d 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -187,6 +187,12 @@
localStorage.setItem("deptCode", "");
localStorage.setItem("YongHuID", "1478905109432766464");
localStorage.setItem("YongHuXM", "LQRMYY");
+ } else if (orgid == "20001001") {
+ localStorage.setItem("orgname", "鐪佺珛鍚屽痉缈犺嫅闄㈠尯");
+ localStorage.setItem("ZuHuID", "");
+ localStorage.setItem("deptCode", "");
+ localStorage.setItem("YongHuID", "");
+ localStorage.setItem("YongHuXM", "");
}
resolve();
})
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index a4dcec8..1113245 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1190,21 +1190,21 @@
selectedTag: "",
tagOptions: [
{
- value: "0",
+ value: '0',
label: "姝ｅ父",
type: "normal",
color: "#7ff5e1",
description: "鎮ｈ�呮儏鍐垫甯革紝鏃犻渶鐗瑰埆鍏虫敞",
},
{
- value: "1",
+ value: '1',
label: "寮傚父",
type: "abnormal",
color: "#f75c5c",
description: "鎮ｈ�呭瓨鍦ㄥ紓甯告儏鍐碉紝闇�瑕侀噸鐐瑰叧娉�",
},
{
- value: "2",
+ value: '2',
label: "璀﹀憡",
type: "warning",
color: "#fbfb4a",
@@ -1611,7 +1611,7 @@
);
if (obj) {
if (objs.isabnormal) {
- excep = 1;
+ excep = objs.isabnormal;
}
}
let obj = {
@@ -2760,7 +2760,7 @@
margin: 0 10px 20px 10px;
/* 褰撶缉鏀炬瘮渚嬪ぇ浜�100%鎴栧睆骞曞搴﹁緝灏忔椂鏀逛负涓婁笅鎺掑垪 */
- @media screen and (max-width: 1200px), (min-resolution: 1dppx) {
+ @media screen and (min-resolution: 1.5dppx) {
flex-direction: column;
.call-action,
@@ -2916,9 +2916,8 @@
}
/* 缂╂斁妫�娴嬫牱寮� */
-@media screen and (min-resolution: 1.1dppx),
- screen and (-webkit-min-device-pixel-ratio: 1.1),
- screen and (max-width: 1200px) {
+@media screen and (min-resolution: 1.5dppx),
+ screen and (-webkit-min-device-pixel-ratio: 1.5) {
.action-container {
flex-direction: column;
}
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 8ee26c1..1e7b1a2 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -715,19 +715,20 @@
>
<span style="color: #67c23a">鈼� 姝ｅ父</span>
</el-option>
- <el-option
- :value="1"
- label="寮傚父"
- :style="{ color: '#E6A23C' }"
- >
- <span style="color: #e6a23c">鈼� 寮傚父</span>
- </el-option>
+
<el-option
:value="2"
label="璀﹀憡"
- :style="{ color: '#F56C6C' }"
+ :style="{ color: '#fbfb4a' }"
>
- <span style="color: #f56c6c">鈼� 璀﹀憡</span>
+ <span style="color: #fbfb4a">鈼� 璀﹀憡</span>
+ </el-option>
+ <el-option
+ :value="1"
+ label="寮傚父"
+ :style="{ color: '#f75c5c' }"
+ >
+ <span style="color: #f75c5c">鈼� 寮傚父</span>
</el-option>
</el-select>
</el-form-item>
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index c149057..3b5a39e 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -4,9 +4,15 @@
<div class="questionnaire-container">
<!-- 闂嵎鏍囬鍖哄煙 -->
<div class="questionnaire-header">
- <h1 class="questionnaire-title">{{ taskname ? taskname : "闂嵎" }}</h1>
+ <h1 class="questionnaire-title">
+ {{ taskname ? taskname : "闂嵎" }}
+ </h1>
<div class="questionnaire-description">
- {{ kcb ? kcb : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸鍖婚櫌鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�" }}
+ {{
+ kcb
+ ? kcb
+ : "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸鍖婚櫌鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙ｆ偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�"
+ }}
</div>
</div>
@@ -18,51 +24,81 @@
class="question-item"
v-for="(item, index) in visibleQuestions"
:key="item.id"
- :class="{ 'has-warning': item.prompt && (item.scriptResult && (item.scriptType !== 2 || item.scriptResult.length > 0)) }"
+ :class="{
+ 'has-warning':
+ item.prompt &&
+ item.scriptResult &&
+ (item.scriptType !== 2 || item.scriptResult.length > 0),
+ }"
>
<!-- 棰樼洰棰樺共 -->
<div class="question-stem">
- <span class="question-number">{{ getVisibleQuestionIndex(index) }}.</span>
+ <span class="question-number"
+ >{{ getVisibleQuestionIndex(index) }}.</span
+ >
<span class="question-text">{{ item.scriptContent }}</span>
<span class="question-type-tag">
- {{ item.scriptType === 1 ? '[鍗曢�塢' : item.scriptType === 2 ? '[澶氶�塢' : '[闂瓟]' }}
+ {{
+ item.scriptType === 1
+ ? "[鍗曢�塢"
+ : item.scriptType === 2
+ ? "[澶氶�塢"
+ : "[闂瓟]"
+ }}
</span>
</div>
<!-- 鍗曢�夐鐩� -->
- <div class="question-options" v-if="item.scriptType == 1 && !item.ishide">
+ <div
+ class="question-options"
+ v-if="item.scriptType == 1 && !item.ishide"
+ >
<el-radio-group class="options-group" v-model="item.scriptResult">
<el-radio
- v-for="(option, optionIndex) in item.svyTaskTemplateTargetoptions"
+ v-for="(
+ option, optionIndex
+ ) in item.svyTaskTemplateTargetoptions"
:key="optionIndex"
:label="option.optioncontent"
:class="{
- 'abnormal-option': option.isabnormal && item.scriptResult == option.optioncontent
+ 'abnormal-option':
+ option.isabnormal &&
+ item.scriptResult == option.optioncontent,
}"
- @click.native.prevent="handleRadioToggle(item, index, item.svyTaskTemplateTargetoptions, option.optioncontent)"
+ @click.native.prevent="
+ handleRadioToggle(
+ item,
+ index,
+ item.svyTaskTemplateTargetoptions,
+ option.optioncontent
+ )
+ "
class="option-radio"
>
<span class="option-text">{{ option.optioncontent }}</span>
- <span v-if="option.isabnormal" class="abnormal-indicator">*</span>
</el-radio>
</el-radio-group>
</div>
<!-- 澶氶�夐鐩� -->
<div class="question-options" v-if="item.scriptType == 2">
- <el-checkbox-group class="options-group" v-model="item.scriptResult">
+ <el-checkbox-group
+ class="options-group"
+ v-model="item.scriptResult"
+ >
<el-checkbox
- v-for="(option, optionIndex) in item.svyTaskTemplateTargetoptions"
+ v-for="(
+ option, optionIndex
+ ) in item.svyTaskTemplateTargetoptions"
:key="optionIndex"
:label="option.optioncontent"
:class="{
- 'abnormal-option': option.isabnormal
+ 'abnormal-option': option.isabnormal,
}"
@change="$forceUpdate()"
class="option-checkbox"
>
<span class="option-text">{{ option.optioncontent }}</span>
- <span v-if="option.isabnormal" class="abnormal-indicator">*</span>
</el-checkbox>
</el-checkbox-group>
</div>
@@ -80,19 +116,27 @@
</div>
<!-- 鎻愮ず淇℃伅 -->
- <div class="question-warning" v-show="item.prompt && item.scriptResult && (item.scriptType !== 2 || item.scriptResult.length > 0)">
- <el-alert :title="item.prompt" type="warning" :closable="false" class="warning-alert"></el-alert>
+ <div
+ class="question-warning"
+ v-show="
+ item.prompt &&
+ item.scriptResult &&
+ (item.scriptType !== 2 || item.scriptResult.length > 0)
+ "
+ >
+ <el-alert
+ :title="item.prompt"
+ type="warning"
+ :closable="false"
+ class="warning-alert"
+ ></el-alert>
</div>
</div>
</div>
<!-- 鎻愪氦鎸夐挳 -->
<div class="submit-section">
- <el-button
- type="primary"
- @click="cache(true)"
- class="submit-button"
- >
+ <el-button type="primary" @click="cache(true)" class="submit-button">
鎻愪氦闂嵎
</el-button>
</div>
@@ -105,7 +149,11 @@
<div class="completion-icon">鉁�</div>
<h2 class="completion-title">鎰熻阿鎮ㄧ殑閰嶅悎!</h2>
<p class="completion-message">
- {{ jsy ? jsy : "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒" }}
+ {{
+ jsy
+ ? jsy
+ : "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒"
+ }}
</p>
</div>
</div>
@@ -127,7 +175,8 @@
taskid: 355,
patid: 265823,
kcb: "",
- excep: "",
+ excep: 0,
+ isabnormal: 0,
taskname: "",
questionList: [],
jsy: null,
@@ -268,9 +317,11 @@
param1: this.taskid,
param2: this.patid,
excep: this.excep,
- isabnormal: this.excep,
+ isabnormal: this.isabnormal,
serviceSubtaskDetailList: [],
};
+ console.log(form.isabnormal, "formisabnormal");
+
const arr = structuredClone(this.questionList);
// arr.forEach((item) => {
// item.asrtext = JSON.stringify(item.scriptResult);
@@ -298,7 +349,9 @@
svyTaskTemplateScriptVOS: [],
};
const arr = structuredClone(this.questionList);
- console.log(arr, "srr");
+ arr.forEach((item) => {
+ item.ishide = item.ishide ? 1 : 0;
+ });
arr.forEach((item, index) => {
if (item.scriptType == 1 && item.scriptResult) {
var obj = item.svyTaskTemplateTargetoptions.find(
@@ -314,11 +367,13 @@
item.sendTaskids = String(obj.sendTaskid).split(",");
}
if (obj) {
- if (obj.isabnormal) {
- console.log(obj.isabnormal);
- form.excep = obj.isabnormal;
+ form.excep = obj.isabnormal;
+ form.isabnormal = obj.isabnormal;
+ if (this.isabnormal != 1 && obj.isabnormal) {
this.excep = obj.isabnormal;
+ this.isabnormal = obj.isabnormal;
}
+ console.log(obj.isabnormal);
}
}
});
@@ -352,7 +407,7 @@
// 鍘熸湁鐨勫鐞嗛�昏緫
if (questionItem.scriptResult === optionValue) {
questionItem.scriptResult = "";
- questionItem.isabnormal = false;
+ questionItem.isabnormal = 0;
questionItem.showAppendInput = false;
} else {
questionItem.scriptResult = optionValue;
@@ -375,15 +430,15 @@
const selectedOptionObj = options.find(
(item) => item.optioncontent == selectedOption
);
- if (selectedOption) {
+ if (selectedOptionObj) {
this.questionList[questionIndex].nextScriptno =
- selectedOption.nextQuestion;
- this.questionList[questionIndex].score = selectedOption.score;
- this.questionList[questionIndex].prompt = selectedOption.prompt;
+ selectedOptionObj.nextQuestion;
+ this.questionList[questionIndex].score = selectedOptionObj.score;
+ this.questionList[questionIndex].prompt = selectedOptionObj.prompt;
}
// 澶勭悊寮傚父鐘舵�侀珮浜�
this.questionList[questionIndex].isabnormal =
- !!selectedOptionObj.isabnormal;
+ selectedOptionObj.isabnormal;
// 澶勭悊闄勫姞杈撳叆妗嗘樉绀�
this.questionList[questionIndex].showAppendInput =
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 880ee5f..a789b74 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -1145,13 +1145,20 @@
}
},
// 淇濆瓨
- submitForm(formName) {
+ async submitForm(formName) {
this.form.preachform = this.checkList.join(",");
// this.formatFn(1);
- if (!this.form.patTaskRelevances[0] && this.form.longTask == 0) {
- this.$modal.msgError("璇烽�夋嫨鐥呬汉");
- return;
- }
+ if (!this.form.patTaskRelevances[0] && this.form.longTask == 0) {
+ try {
+ // 绛夊緟鐢ㄦ埛纭
+ await this.$modal.confirm("褰撳墠浠诲姟鏈�夋嫨鎮ｈ�呮槸鍚︿繚瀛橈紵");
+ // 鍙湁鐢ㄦ埛鐐瑰嚮鈥滅‘璁も�濆悗锛屼唬鐮佹墠浼氭墽琛屽埌杩欓噷
+ } catch (error) {
+ // 鐢ㄦ埛鐐瑰嚮浜嗏�滃彇娑堚�濓紝鐩存帴涓柇鍑芥暟鎵ц
+ this.$modal.msgWarning("鎿嶄綔宸插彇娑�");
+ return; // 鍏抽敭锛氳繖閲宺eturn鐩存帴閫�鍑哄嚱鏁�
+ }
+ }
if (!this.form.templatename) {
this.$modal.msgError("鏈�夋嫨妯℃澘");
return;
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index fe833bd..46770d9 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -1462,10 +1462,23 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
+ const params = {
+ ...this.queryParams,
+ // 濡傛灉閫夋嫨浜�"鍏ㄩ儴"锛屽垯浼犳墍鏈夌梾鍖�/绉戝浠ｇ爜
+ leavehospitaldistrictcodes:
+ this.queryParams.leavehospitaldistrictcodes.includes("all")
+ ? this.allWardCodes
+ : this.queryParams.leavehospitaldistrictcodes,
+ deptcodes: this.queryParams.deptcodes.includes("all")
+ ? this.allDeptCodes
+ : this.queryParams.deptcodes,
+ };
+ delete params.leavehospitaldistrictcodes.all;
+ delete params.deptcodes.all;
this.download(
"smartor/serviceSubtask/getSfStatisticsExport",
{
- ...this.queryParams,
+ ...params,
},
`user_${new Date().getTime()}.xlsx`
);
--
Gitblit v1.9.3