From 65c54e73260d22926e175e337d72e6a9acfddd64 Mon Sep 17 00:00:00 2001
From: sendo <172933527@qq.com>
Date: 星期三, 17 九月 2025 18:24:56 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
src/views/followvisit/tasklist/index.vue | 12 ++-
vue.config.js | 6 +-
src/views/followvisit/record/detailpage/index.vue | 123 ++++++++++++++++++++++-------------------
3 files changed, 76 insertions(+), 65 deletions(-)
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 426e933..dfc141d 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -317,7 +317,7 @@
</el-radio-group>
</div>
<div
- v-if="item.showAppendInput||item.answerps"
+ v-if="item.showAppendInput || item.answerps"
class="append-input-container"
>
<el-input
@@ -548,7 +548,7 @@
>淇濆瓨鍩虹淇℃伅</el-button
>
</div>
- <div>
+ <!-- <div>
<el-button
type="primary"
round
@@ -556,7 +556,7 @@
@click="sendAgain()"
>鍐嶆闅忚</el-button
>
- </div>
+ </div> -->
</div>
<el-row>
<el-col :span="14"
@@ -1307,49 +1307,49 @@
});
this.Editsingletasksonyic(6);
- this.$modal
- .confirm(
- '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
- this.logsheetlist[0].sendname +
- '"鍐嶆闅忚锛�',
- "纭",
- {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- showCancelButton: true,
- dangerouslyUseHTMLString: true,
- confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
- cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
- }
- )
- .then(() => {
- document.querySelector("#app").scrollTo(0, 0);
- this.formtidy();
- this.dialogFormVisible = true;
- })
- .catch(() => {
- if (this.form.serviceType == 13) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/logisticsservice/zbAgain",
- });
- } else {
- this.$router.push({
- path: "/logisticsservice/record",
- });
- }
- } else if (this.form.serviceType == 2) {
- if (this.visitCount != 1) {
- this.$router.push({
- path: "/logisticsservice/again",
- });
- } else {
- this.$router.push({
- path: "/followvisit/discharge",
- });
- }
- }
- });
+ // this.$modal
+ // .confirm(
+ // '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮ｈ�咃細"' +
+ // this.logsheetlist[0].sendname +
+ // '"鍐嶆闅忚锛�',
+ // "纭",
+ // {
+ // confirmButtonText: "纭畾",
+ // cancelButtonText: "鍙栨秷",
+ // showCancelButton: true,
+ // dangerouslyUseHTMLString: true,
+ // confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
+ // cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
+ // }
+ // )
+ // .then(() => {
+ // document.querySelector("#app").scrollTo(0, 0);
+ // this.formtidy();
+ // this.dialogFormVisible = true;
+ // })
+ // .catch(() => {
+ // if (this.form.serviceType == 13) {
+ // if (this.visitCount != 1) {
+ // this.$router.push({
+ // path: "/logisticsservice/zbAgain",
+ // });
+ // } else {
+ // this.$router.push({
+ // path: "/logisticsservice/record",
+ // });
+ // }
+ // } else if (this.form.serviceType == 2) {
+ // if (this.visitCount != 1) {
+ // this.$router.push({
+ // path: "/logisticsservice/again",
+ // });
+ // } else {
+ // this.$router.push({
+ // path: "/followvisit/discharge",
+ // });
+ // }
+ // }
+ // });
})
.catch((error) => {
// 濡傛灉鏈変换浣曚竴涓紓姝ユ搷浣滃け璐ワ紝浼氳繘鍏ヨ繖閲�
@@ -1532,9 +1532,13 @@
subId: id,
}).then((res) => {
if (res.code == 200) {
+ console.log(11);
+
this.form = res.rows[0].serviceSubtaskList.find(
(item) => item.id == this.id
);
+ console.log(this.form);
+
console.log(this.form.serviceType, "serviceType");
this.logsheetlist = res.rows[0].serviceSubtaskList;
@@ -1639,17 +1643,17 @@
},
aahandleOptionChange(a, b, c) {
const result = c.find((item) => item.optioncontent == a);
- if (result.nextQuestion == 0) {
- this.tableDatatop = this.tableDatatop.reduce((acc, item, i) => {
- acc.push(i > b ? { ...item, astrict: 1 } : item);
- return acc;
- }, []);
- } else {
- this.tableDatatop = this.tableDatatop.reduce((acc, item, i) => {
- acc.push(i > b ? { ...item, astrict: 0 } : item);
- return acc;
- }, []);
- }
+ // if (result.nextQuestion == 0) {
+ // this.tableDatatop = this.tableDatatop.reduce((acc, item, i) => {
+ // acc.push(i > b ? { ...item, astrict: 1 } : item);
+ // return acc;
+ // }, []);
+ // } else {
+ // this.tableDatatop = this.tableDatatop.reduce((acc, item, i) => {
+ // acc.push(i > b ? { ...item, astrict: 0 } : item);
+ // return acc;
+ // }, []);
+ // }
if (this.Voicetype) {
var obj = this.tableDatatop[b].ivrTaskScriptTargetoptionList.find(
(item) => item.optioncontent == a
@@ -1668,6 +1672,11 @@
},
// 鍦╩ethods閮ㄥ垎锛屼慨鏀筯andleOptionChange鏂规硶:
handleOptionChange(selectedOption, questionIndex, options, a) {
+ // 鍒ゆ柇鏄惁璇煶
+ if (this.Voicetype) {
+ this.aahandleOptionChange(selectedOption, questionIndex, options);
+ return;
+ }
if (document.activeElement) {
document.activeElement.blur();
}
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 5143c6f..10a9838 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -90,7 +90,7 @@
>
<el-option
v-for="item in longtermlist"
- :key="item.value"
+ :key="item.label"
:label="item.label"
:value="item.value"
>
@@ -627,7 +627,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 2,
+ type: 1,
userName: undefined,
tagid: undefined,
topic: undefined,
@@ -721,7 +721,7 @@
this.tasktopic == 7 ||
this.tasktopic == 6
) {
- if (!this.topqueryParams.type) this.topqueryParams.type = "2";
+ if (!this.topqueryParams.type) this.topqueryParams.type = 1;
this.longtermlist = [
{
value: 1,
@@ -732,7 +732,7 @@
label: "闂嵎闅忚",
},
];
- this.topqueryParams.type=2;
+ // this.topqueryParams.type = 2;
} else if (this.tasktopic == 4 || this.tasktopic == 8) {
if (!this.topqueryParams.type) this.topqueryParams.type = "3";
this.longtermlist = [
@@ -741,7 +741,7 @@
label: "瀹ｆ暀鍏虫��",
},
];
- this.topqueryParams.type=3;
+ this.topqueryParams.type = 3;
} else if (this.tasktopic == 5) {
if (!this.topqueryParams.type) this.topqueryParams.type = "1";
this.longtermlist = [
@@ -808,6 +808,8 @@
this.getList();
},
handleQuery() {
+ console.log(this.topqueryParams.type);
+
this.topqueryParams.pageNum = 1;
this.getList();
},
diff --git a/vue.config.js b/vue.config.js
index d8fb6b0..1fed96b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://www.health-y.cn/lssf`,
- // target: `http://10.202.20.185:8095`,
- // target: `http://192.168.100.184:8095`,
- target:`http://localhost:8095`,
+ target: `http://192.168.100.10:8095`,
+ // target: `http://192.168.100.158:8095`,
+ // target:`http://localhost:8095`,
// target: `http://192.168.101.135:8095`,
// target: `http://192.168.101.166:8093`,
// target: `http://192.168.191.181:8095`,
--
Gitblit v1.9.3