|
@@ -367,7 +367,7 @@
|
|
|
console.log('res', res)
|
|
console.log('res', res)
|
|
|
}
|
|
}
|
|
|
let url = '/pages/process/index?insId=' + processInfo.insId + '&insName=' + processInfo.insName + '&control=' + processInfo.control
|
|
let url = '/pages/process/index?insId=' + processInfo.insId + '&insName=' + processInfo.insName + '&control=' + processInfo.control
|
|
|
- console.log('url',url);
|
|
|
|
|
|
|
+ // console.log('url',url);
|
|
|
return {
|
|
return {
|
|
|
title: processInfo.insName,
|
|
title: processInfo.insName,
|
|
|
path: url
|
|
path: url
|
|
@@ -444,7 +444,6 @@
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
formElements.value = modifyReturnParams(returnParams)
|
|
formElements.value = modifyReturnParams(returnParams)
|
|
|
- console.log('formElements1',formElements.value);
|
|
|
|
|
formInfo.value = returnParams.formInfo[0]
|
|
formInfo.value = returnParams.formInfo[0]
|
|
|
repeatingForm.value = returnParams.repeatingForm
|
|
repeatingForm.value = returnParams.repeatingForm
|
|
|
getMainFormRule()
|
|
getMainFormRule()
|
|
@@ -1005,7 +1004,9 @@
|
|
|
}
|
|
}
|
|
|
function validateRepeatingForm2() {
|
|
function validateRepeatingForm2() {
|
|
|
// 设置重复表校验数据
|
|
// 设置重复表校验数据
|
|
|
- repeatingFormsValue.value = repeatingForm.value.elements.map((item, index) => {
|
|
|
|
|
|
|
+ const filterElements = repeatingForm.value.elements.filter(item => item.canEdit == "1")
|
|
|
|
|
+ if (filterElements.length == 0) return true
|
|
|
|
|
+ repeatingFormsValue.value = filterElements.map((item, index) => {
|
|
|
return computed(() => {
|
|
return computed(() => {
|
|
|
const obj = {};
|
|
const obj = {};
|
|
|
item.forEach(({ name, defaultValue }) => {
|
|
item.forEach(({ name, defaultValue }) => {
|