|
@@ -820,7 +820,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
- if (len.length == 3 && (key == 1 || key == 0)) {
|
|
|
+ if (len.length == 3 && (key == 1 || key == 0) && key==0?len[2].subLenCode:len[1].subLenCode) {
|
|
|
const dragVal = key==0?len[2].subLenCode:len[1].subLenCode
|
|
|
this.dragVal =dragVal;
|
|
|
const subobj = this.baseTypeList.find((it) => it.type == 1);
|
|
@@ -952,6 +952,7 @@ export default {
|
|
|
});
|
|
|
len[1].baseTermTypeList = screenArr;
|
|
|
}
|
|
|
+
|
|
|
this.dragVal = len[1].subLenCode;
|
|
|
}
|
|
|
} else {
|
|
@@ -1075,11 +1076,11 @@ export default {
|
|
|
if (
|
|
|
//判断3条规则是否都已选中
|
|
|
dragDel.length > 0 &&
|
|
|
- len.length > 1 &&
|
|
|
+ len.length == 3 &&
|
|
|
index > 0 &&
|
|
|
key > 0
|
|
|
) {
|
|
|
- if (len.length == 3 && type) {
|
|
|
+ if (type) {
|
|
|
//判断是否存在符合互斥条件的两条出具,若存在,置空另一条出具
|
|
|
if (
|
|
|
code != "" &&
|
|
@@ -1122,11 +1123,13 @@ export default {
|
|
|
//获取互斥项code
|
|
|
const dragArr = list[0].remark.split("|")[1].split(",");
|
|
|
this.dragArr = dragArr;
|
|
|
- if (len[1]) {
|
|
|
- len[1].dragArr = dragArr;
|
|
|
- } else if (len[2]) {
|
|
|
- len[2].dragArr = dragArr;
|
|
|
- }
|
|
|
+ len[1].dragArr = dragArr;
|
|
|
+ len[2].dragArr = dragArr;
|
|
|
+ // if (len[1]) {
|
|
|
+ // len[1].dragArr = dragArr;
|
|
|
+ // } else if (len[2]) {
|
|
|
+ // len[2].dragArr = dragArr;
|
|
|
+ // }
|
|
|
//获取互斥项
|
|
|
const screenArr = subobj.subMenuList.filter((item) =>
|
|
|
dragArr.some(
|