From bc9538a9e071259ca8bbb6de52c60c9d7a55a03b Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期三, 23 九月 2026 14:02:44 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/record/detailpage/index.vue | 184 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 155 insertions(+), 29 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 43446b9..cb22dd1 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -127,6 +127,29 @@
</el-tooltip>
</template>
</el-table-column>
+ <el-table-column
+ v-if="
+ orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�' ||
+ orgname == '涓芥按甯備腑鍖婚櫌'
+ "
+ label="鎷ㄥ彿鐘舵��"
+ width="120"
+ align="center"
+ key="isManuallyCalled"
+ prop="isManuallyCalled"
+ >
+ <template slot-scope="scope">
+ <el-tag
+ v-if="Number(scope.row.isManuallyCalled) > 0"
+ type="success"
+ :disable-transitions="false"
+ >鎷ㄩ�歿{ scope.row.isManuallyCalled }}娆�</el-tag
+ >
+ <el-tag v-else type="info" :disable-transitions="false"
+ >鏈嫧閫�</el-tag
+ >
+ </template>
+ </el-table-column>
<el-table-column
prop="finishtime"
align="center"
@@ -283,6 +306,8 @@
>
</el-table-column>
+
+
<el-table-column
prop="bankcardno"
align="center"
@@ -336,8 +361,8 @@
v-if="
(orgname == '鍗楀崕澶у闄勫睘绗竴鍖婚櫌' ||
orgname == '涓芥按甯傜浜屼汉姘戝尰闄�' ||
- orgname == '缂欎簯鍘夸汉姘戝尰闄�'||
- orgname == '涓芥按甯傚骞间繚鍋ラ櫌'||
+ orgname == '缂欎簯鍘夸汉姘戝尰闄�' ||
+ orgname == '涓芥按甯傚骞间繚鍋ラ櫌' ||
orgname == '鏉鹃槼鍘夸腑鍖诲尰闄�') &&
!Voicetype
"
@@ -999,16 +1024,29 @@
<div class="collapse-section">
<el-collapse v-model="collapseActive" accordion>
<el-collapse-item title="鎮ｈ�呮。妗堜俊鎭�" name="patient">
- <el-form ref="userform2" :model="userform" label-width="90px" size="small">
+ <el-form
+ ref="userform2"
+ :model="userform"
+ label-width="90px"
+ size="small"
+ >
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="鎮ｈ�呭鍚�">
- <el-input v-model="userform.name" placeholder="璇疯緭鍏ュ鍚�" maxlength="30"></el-input>
+ <el-input
+ v-model="userform.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ maxlength="30"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎬у埆">
- <el-select v-model="userform.sex" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-select
+ v-model="userform.sex"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
<el-option label="鐢�" :value="1"></el-option>
<el-option label="濂�" :value="2"></el-option>
</el-select>
@@ -1018,53 +1056,78 @@
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="骞撮緞">
- <el-input v-model="userform.age" placeholder="璇疯緭鍏ュ勾榫�" maxlength="20"></el-input>
+ <el-input
+ v-model="userform.age"
+ placeholder="璇疯緭鍏ュ勾榫�"
+ maxlength="20"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鑱旂郴鏂瑰紡">
- <el-input v-model="userform.telcode" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�" maxlength="20"></el-input>
+ <el-input
+ v-model="userform.telcode"
+ placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"
+ maxlength="20"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="24">
<el-form-item label="浜插睘鐢佃瘽">
- <el-input v-model="userform.relativetelcode" placeholder="璇疯緭鍏ヤ翰灞炶仈绯绘柟寮�" maxlength="20"></el-input>
+ <el-input
+ v-model="userform.relativetelcode"
+ placeholder="璇疯緭鍏ヤ翰灞炶仈绯绘柟寮�"
+ maxlength="20"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="24">
<el-form-item label="璇婃柇鍚嶇О">
- <el-input v-model="form.leavediagname" placeholder="璇疯緭鍏ヨ瘖鏂�" maxlength="50"></el-input>
+ <el-input
+ v-model="form.leavediagname"
+ placeholder="璇疯緭鍏ヨ瘖鏂�"
+ maxlength="50"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="24">
<el-form-item label="鍑虹敓鍦�">
- <el-input v-model="userform.birthplace" placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑" maxlength="50"></el-input>
+ <el-input
+ v-model="userform.birthplace"
+ placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑"
+ maxlength="50"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="24">
<el-form-item label="灞呬綇鍦�">
- <el-input v-model="userform.placeOfResidence" placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑" maxlength="50"></el-input>
+ <el-input
+ v-model="userform.placeOfResidence"
+ placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑"
+ maxlength="50"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-collapse-item>
- <el-collapse-item title="鎶曡瘔寤鸿" name="advice" v-if="orgname=='缂欎簯鍘夸汉姘戝尰闄�'">
+ <el-collapse-item
+ title="鎶曡瘔寤鸿"
+ name="advice"
+ v-if="orgname == '缂欎簯鍘夸汉姘戝尰闄�'"
+ >
<AdviceList :subid="taskid" :taskid="id" :patid="patid" />
</el-collapse-item>
</el-collapse>
</div>
-
-
-
</div>
</div>
</div>
@@ -1274,7 +1337,11 @@
:visible.sync="CaldialogVisible"
width="60%"
>
- <CallCenterLs ref="CallCenterLs" :initial-phone="currentPhoneNumber" />
+ <CallCenterLs
+ ref="CallCenterLs"
+ :initial-phone="currentPhoneNumber"
+ @call-connected="recordCallConnected"
+ />
</el-dialog>
</div>
</div>
@@ -1670,7 +1737,7 @@
},
// 鏄惁浠ラ棶鍗峰舰寮忓睍绀猴紙闈炶闊虫湇鍔★紝鎴栬闊虫湇鍔′絾鏃犲畬鏁磋闊虫暟鎹渶鎵嬪姩濉姤锛�
showQuestionnaireForm() {
- return !this.Voicetype ;
+ return !this.Voicetype;
},
// 鏄惁涓虹鐞嗗憳瑙掕壊
isAdmin() {
@@ -2046,13 +2113,12 @@
.map((obj) => obj.targetvalue)
.join("&");
}
- console.log(item.targetvalue,'item.targetvalue');
+ console.log(item.targetvalue, "item.targetvalue");
if (item.targetvalue) {
item.scriptResult = item.targetvalue.split("&");
}
console.log(item.scriptResult);
-
});
}
});
@@ -2118,8 +2184,11 @@
this.$modal.msgSuccess("鏈嶅姟淇濆瓨鎴愬姛");
this.Editsingletasksonyic(this.serviceStates);
const orgName = localStorage.getItem("orgname");
-
- if (this.form.isVisitAgain != 1 || this.visitAgain == 1) {
+ if (
+ this.form.isVisitAgain != 1 ||
+ orgName == "涓芥按甯備腑鍖婚櫌" ||
+ this.visitAgain == 1
+ ) {
this.Torouter();
return;
}
@@ -2309,7 +2378,7 @@
this.CaldialogVisible = true;
return;
}
- // 涓嬫柟鏄腑鍖婚櫌鍛煎彨
+ // 涓嬫柟鏄附姘村競涓尰闄�
if (this.isSipRegistering) {
this.$message.warning("绯荤粺姝ｅ湪鍒濆鍖栵紝璇风◢鍊�...");
return;
@@ -2339,11 +2408,15 @@
this.callStatus = status.type;
if (status.type === "connected") {
- this.currentCall = {
- phone: this.currentPhoneNumber,
- type: this.callType,
- startTime: new Date(),
- };
+ if (!this.currentCall) {
+ this.currentCall = {
+ phone: this.currentPhoneNumber,
+ type: this.callType,
+ startTime: new Date(),
+ };
+ // 涓芥按甯備腑鍖婚櫌锛氱數璇濇帴閫氬悗璁板綍鎷ㄦ墦鎴愬姛娆℃暟
+ this.recordCallConnected();
+ }
} else if (status.type === "ended" || status.type === "failed") {
this.currentCall = null;
}
@@ -2352,6 +2425,39 @@
if (status.type === "failed") {
this.$message.error(`鍛煎彨澶辫触: ${status.text}`);
}
+ },
+ // 鐢佃瘽鎷ㄦ墦鎴愬姛鍚庯紙鎺ラ�氾級娆℃暟 +1锛屽苟閫氳繃 Editsingletaskson 鏇存柊鏈嶅姟鏁版嵁
+ // 浠呴檺鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄笌涓芥按甯備腑鍖婚櫌
+ recordCallConnected() {
+ const allowedOrgs = ["鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�", "涓芥按甯備腑鍖婚櫌"];
+ if (!allowedOrgs.includes(this.orgname)) return;
+
+ getTaskservelist({
+ patid: this.patid,
+ subId: this.id,
+ }).then((res) => {
+ if (res.code == 200) {
+ const objson = res.rows[0].serviceSubtaskList.find(
+ (item) => item.id == this.id
+ );
+ if (!objson) return;
+ objson.isManuallyCalled = (Number(objson.isManuallyCalled) || 0) + 1;
+ Editsingletaskson(objson).then((r) => {
+ if (r.code == 200) {
+ // 鍙婃椂鏇存柊椤堕儴鏈嶅姟鍒楄〃涓庤〃鍗曚腑鐨勬嫧鍙风姸鎬�
+ const localRow = (this.logsheetlist || []).find(
+ (item) => item.id == this.id
+ );
+ if (localRow) {
+ localRow.isManuallyCalled = objson.isManuallyCalled;
+ }
+ if (this.form && this.form.id == this.id) {
+ this.form.isManuallyCalled = objson.isManuallyCalled;
+ }
+ }
+ });
+ }
+ });
},
// 缁撴潫褰撳墠閫氳瘽
endCurrentCall() {
@@ -2407,7 +2513,7 @@
savequestiondetail(obj).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("鏈嶅姟淇濆瓨鎴愬姛");
- // this.Torouter();
+
if (
this.form.isVisitAgain != 1 ||
orgName == "涓芥按甯備腑鍖婚櫌" ||
@@ -2418,6 +2524,7 @@
this.Torouter();
return;
}
+
this.$modal
.confirm(
'浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
@@ -2750,6 +2857,7 @@
// 鍚屾椂閲嶇疆涓庨�夐」鐩稿叧鐨勭姸鎬�
// questionItem.isabnormal = false;
questionItem.showAppendInput = false;
+ questionItem.score = null; // 鍙栨秷閫変腑鍚庢竻绌洪鐩垎鏁�
// 娉ㄦ剰锛氬彇娑堥�変腑鏃讹紝鎴戜滑閫氬父涓嶅笇鏈涜Е鍙戦鐩烦杞�昏緫锛屾墍浠ョ洿鎺ヨ繑鍥�
// 濡傛灉闇�瑕侊紝鍙互鍦ㄨ繖閲屾坊鍔犲彇娑堥�変腑鍚庣殑鐗瑰畾閫昏緫锛屼緥濡傞噸缃鐩簭鍒�
} else {
@@ -2787,6 +2895,9 @@
// 澶勭悊寮傚父鐘舵�侀珮浜�
this.tableDatatop[questionIndex].isabnormal =
selectedOptionObj.isabnormal;
+
+ // 澶勭悊鍒嗘暟锛氭妸閫変腑閫夐」鐨� score 甯﹀埌棰樼洰 score 涓�
+ this.tableDatatop[questionIndex].score = selectedOptionObj.score;
// 澶勭悊闄勫姞杈撳叆妗嗘樉绀�
@@ -2881,6 +2992,10 @@
if (obj.isabnormal) {
this.tableDatatop[index].isabnormal = obj.isabnormal;
}
+ // 鍥炴樉鍗曢�夐鐩垎鏁帮細鎶婂凡閫変腑閫夐」鐨� score 甯﹀埌棰樼洰 score 涓�
+ if (obj.score !== undefined && obj.score !== null) {
+ this.tableDatatop[index].score = obj.score;
+ }
this.$forceUpdate();
}
});
@@ -2952,7 +3067,18 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
},
- updateScore(a, b, c) {},
+ // 澶氶�夛細鎶婇�変腑閫夐」鐨勫垎鏁扮疮鍔犲埌棰樼洰 score 涓�
+ updateScore(selectedValues, questionIndex, question) {
+ const options = question.svyTaskTemplateTargetoptions || [];
+ const score = options.reduce((sum, opt) => {
+ if (selectedValues && selectedValues.includes(opt.optioncontent)) {
+ return sum + (Number(opt.score) || 0);
+ }
+ return sum;
+ }, 0);
+ question.score = score;
+ this.$forceUpdate();
+ },
// 鍚堝苟淇敼鐩稿叧=============================
toggleMergeMode() {
this.isMergeMode = !this.isMergeMode;
--
Gitblit v1.9.3