|
|
@@ -228,11 +228,7 @@
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div v-if="AssesComSHow && AssesTabSHow" v-show="tabActive == 'two'">
|
|
|
- <AddAssess
|
|
|
- @scrollTo="scrollTo"
|
|
|
- :childScaleData="scaleData"
|
|
|
- ref="assessRef"
|
|
|
- />
|
|
|
+ <AddAssess :childScaleData="scaleData" ref="assessRef" />
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
@@ -392,9 +388,7 @@ export default {
|
|
|
.then((res) => {
|
|
|
if (res.data.code == "0") {
|
|
|
const data = res.data.data;
|
|
|
- console.log("??????12121", data.scale);
|
|
|
if (data.scale) {
|
|
|
- console.log("!!!!!11111");
|
|
|
this.scaleData = data.scale;
|
|
|
this.AssesTabSHow = true;
|
|
|
} else {
|
|
|
@@ -447,7 +441,6 @@ export default {
|
|
|
this.staticTabShow = false;
|
|
|
this.tabActiveChange("two");
|
|
|
}
|
|
|
- console.log("!!!!!!!!dawdaces", data.scale);
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
@@ -539,12 +532,6 @@ export default {
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
- scrollTo(value) {
|
|
|
- let div = this.$refs["elscrollbar"].$refs["wrap"];
|
|
|
- console.log("after", div.scrollTop);
|
|
|
- div.scrollTop = value;
|
|
|
- console.log("before", div.scrollTop);
|
|
|
- },
|
|
|
tabActiveChange(type) {
|
|
|
this.tabActive = type;
|
|
|
if (type == "two") {
|
|
|
@@ -569,7 +556,6 @@ export default {
|
|
|
},
|
|
|
changeWord(newVal) {
|
|
|
this.tabErrMsg = null;
|
|
|
- console.log(newVal, "选中");
|
|
|
if (newVal.typeName == "量表") {
|
|
|
this.AssesComSHow = true;
|
|
|
} else {
|
|
|
@@ -693,11 +679,11 @@ export default {
|
|
|
let positionArr = positiontemp.reduce(function (a, b) {
|
|
|
return a.concat(b);
|
|
|
}); // 所有被选中的值集合
|
|
|
- console.log(positionArr, "positionArr");
|
|
|
- console.log(this.showType, "当前页的显示类型");
|
|
|
+ // console.log(positionArr, "positionArr");
|
|
|
+ // console.log(this.showType, "当前页的显示类型");
|
|
|
let isVisFlag = positionArr.some((item) => item === 2);
|
|
|
let isDiagFlag = positionArr.some((item) => item === 3);
|
|
|
- console.log(isVisFlag, "isVisFlag是否显示");
|
|
|
+ // console.log(isVisFlag, "isVisFlag是否显示");
|
|
|
if (
|
|
|
(this.showType == 3 ||
|
|
|
this.showType == 4 ||
|
|
|
@@ -705,7 +691,7 @@ export default {
|
|
|
this.showType == 6) &&
|
|
|
isVisFlag
|
|
|
) {
|
|
|
- console.log("进入校验");
|
|
|
+ // console.log("进入校验");
|
|
|
//若医学术语为检验/检查，且内容类型选择了注意事项，此时“注意事项标题”是必填项
|
|
|
this.$refs.groups && this.$refs.groups.clearValidate();
|
|
|
this.rules.titleChange.push({
|
|
|
@@ -787,7 +773,7 @@ export default {
|
|
|
if (valid) {
|
|
|
resolve(true);
|
|
|
} else {
|
|
|
- reject("f", object);
|
|
|
+ reject("top", object);
|
|
|
return false;
|
|
|
}
|
|
|
});
|
|
|
@@ -822,27 +808,6 @@ export default {
|
|
|
if (this.$refs.assessRef) {
|
|
|
all.push(...this.$refs.assessRef.assessCommit());
|
|
|
}
|
|
|
- console.log("all", all);
|
|
|
- // await Promise.all(all)
|
|
|
- // .then(() => {
|
|
|
- // console.log("3.5");
|
|
|
- // })
|
|
|
- // .catch((err, obj) => {
|
|
|
- // console.log("obj", err, obj);
|
|
|
- // // 跳转到未校验通过的tab页
|
|
|
- // if (err == "f") {
|
|
|
- // this.tabActive = "one";
|
|
|
- // this.tabErrMsg = `"静态知识"`;
|
|
|
- // } else if (err == "c") {
|
|
|
- // this.tabActive = "two";
|
|
|
- // this.tabErrMsg = `"评估内容"`;
|
|
|
- // }
|
|
|
- // if (this.staticTabShow) {
|
|
|
- // goOn = false;
|
|
|
- // outIsVia = false;
|
|
|
- // }
|
|
|
- // });
|
|
|
- // console.log(viewHeightArr,'viewHeightArr');
|
|
|
// 批量处理Promise返回
|
|
|
let transferedPromises = (promises) => {
|
|
|
// 返回一个处理之后的promise数组
|
|
|
@@ -852,14 +817,15 @@ export default {
|
|
|
};
|
|
|
let promiseArr = transferedPromises(all);
|
|
|
await Promise.all(promiseArr).then((resArr) => {
|
|
|
- console.log(resArr);
|
|
|
let cErrIndex = resArr.findIndex((item) => item.type == "c");
|
|
|
let fErrIndex = resArr.findIndex((item) => item == "f");
|
|
|
-
|
|
|
- if (cErrIndex != -1 && fErrIndex != -1) {
|
|
|
+ let topErrIndex = resArr.findIndex((item) => item == "top");
|
|
|
+ if (topErrIndex != -1) {
|
|
|
+ console.log("????");
|
|
|
+ outIsVia = false;
|
|
|
+ } else if (cErrIndex != -1 && fErrIndex != -1) {
|
|
|
if (this.staticTabShow) {
|
|
|
goOn = false;
|
|
|
- outIsVia = false;
|
|
|
}
|
|
|
this.tabActive = "one";
|
|
|
this.tabErrMsg = `"静态知识"和"评估内容"`;
|
|
|
@@ -870,9 +836,23 @@ export default {
|
|
|
if (cErrArr) {
|
|
|
cErrArr = Object.keys(cErrArr[0].object);
|
|
|
}
|
|
|
- console.log("cErrArr", cErrArr[0]);
|
|
|
- let domTop = this.$refs.assessRef.getDom(cErrArr[0]);
|
|
|
- console.log("domTop", domTop);
|
|
|
+
|
|
|
+ this.$nextTick(() => {
|
|
|
+ setTimeout(() => {
|
|
|
+ let domTop = this.$refs.assessRef.getDom(cErrArr[0]);
|
|
|
+ console.log("domTop", domTop);
|
|
|
+ var div = this.$refs["elscrollbar"].$refs["wrap"];
|
|
|
+ console.log("scrollTop-before", div.scrollTop);
|
|
|
+ console.log("domTop", domTop);
|
|
|
+ if (domTop >= 0) {
|
|
|
+ div.scrollTop += domTop - 120;
|
|
|
+ } else {
|
|
|
+ div.scrollTop -= Math.abs(domTop) + 120;
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log("scrollTop-after", div.scrollTop);
|
|
|
+ }, 100);
|
|
|
+ });
|
|
|
} else if (cErrIndex == -1 && fErrIndex != -1) {
|
|
|
this.tabActive = "one";
|
|
|
this.tabErrMsg = `"静态知识"`;
|
|
|
@@ -880,21 +860,26 @@ export default {
|
|
|
assessRule = true;
|
|
|
}
|
|
|
});
|
|
|
+ console.log(this.staticTabShow, goOn);
|
|
|
if (this.staticTabShow && !goOn) {
|
|
|
- if (this.staticTabShow) {
|
|
|
- var div = this.$refs["elscrollbar"].$refs["wrap"];
|
|
|
- if (outIsVia) {
|
|
|
- // 外层校验通过,跳转至下层校验具体位置
|
|
|
- this.$nextTick(() => {
|
|
|
- div.scrollTop = +viewHeightArr[0] - 150;
|
|
|
- });
|
|
|
- } else {
|
|
|
- // 外层校验没通过,页面滚动到顶部
|
|
|
- this.$nextTick(() => {
|
|
|
- div.scrollTop = 0;
|
|
|
- });
|
|
|
- }
|
|
|
+ var div = this.$refs["elscrollbar"].$refs["wrap"];
|
|
|
+ if (outIsVia) {
|
|
|
+ // 外层校验通过,跳转至下层校验具体位置
|
|
|
+ console.log("div.scrollTop", div.scrollTop);
|
|
|
+ this.$nextTick(() => {
|
|
|
+ if (viewHeightArr[0] >= 0) {
|
|
|
+ div.scrollTop += viewHeightArr[0] - 120;
|
|
|
+ } else {
|
|
|
+ div.scrollTop -= Math.abs(viewHeightArr[0]) + 120;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ // 外层校验没通过,页面滚动到顶部
|
|
|
+ this.$nextTick(() => {
|
|
|
+ div.scrollTop = 0;
|
|
|
+ });
|
|
|
}
|
|
|
+
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -952,12 +937,10 @@ export default {
|
|
|
} else {
|
|
|
paramsAll.details = null;
|
|
|
}
|
|
|
- console.log("paramsAll", paramsAll);
|
|
|
param = paramsAll;
|
|
|
if (!param.details) param.details = [];
|
|
|
// 评估内容的数据
|
|
|
param.scale = {};
|
|
|
- console.log(this.AssesComSHow);
|
|
|
if (this.AssesComSHow && this.AssesTabSHow) {
|
|
|
const assessParam = this.$refs.assessRef.formtParams();
|
|
|
param.scale = assessParam;
|
|
|
@@ -971,7 +954,6 @@ export default {
|
|
|
console.log("param-------");
|
|
|
console.dir(param);
|
|
|
// return;
|
|
|
- console.log("this.isEdit", this.isEdit);
|
|
|
if (!this.isEdit) {
|
|
|
// 新增页面
|
|
|
console.log("!!!");
|
|
|
@@ -993,7 +975,6 @@ export default {
|
|
|
|
|
|
//保存编辑 接口
|
|
|
sendSaveOrEdit(param) {
|
|
|
- console.log("???????");
|
|
|
this.isCopy && (param.id = undefined);
|
|
|
param.source = 1; //0:医院端 1：云平台
|
|
|
api
|
reaper