Browse Source

fix(process):流程审批重复表数据校验

HMY 1 year ago
parent
commit
fa73d1de93
2 changed files with 5 additions and 4 deletions
  1. 4 3
      pages/process/detail/index.vue
  2. 1 1
      pages/process/index.vue

+ 4 - 3
pages/process/detail/index.vue

@@ -367,7 +367,7 @@
 			console.log('res', res)
 		}
 		let url = '/pages/process/index?insId=' + processInfo.insId + '&insName=' + processInfo.insName + '&control=' + processInfo.control
-		console.log('url',url);
+		// console.log('url',url);
 		return {
 			title: processInfo.insName,
 			path: url
@@ -444,7 +444,6 @@
 					});
 				};
 				formElements.value = modifyReturnParams(returnParams)
-				console.log('formElements1',formElements.value);
 				formInfo.value = returnParams.formInfo[0]
 				repeatingForm.value = returnParams.repeatingForm
 				getMainFormRule()
@@ -1005,7 +1004,9 @@
 	}
 	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(() => {
 				const obj = {};
 				item.forEach(({ name, defaultValue }) => {

+ 1 - 1
pages/process/index.vue

@@ -247,7 +247,7 @@
 		if (tinsId) {
 			url = url + '&tinsId=' + tinsId
 		}
-		console.log('url', url)
+		// console.log('url', url)
 		$tab.navigateTo(url)
 	}
 	function handleToCancelProcess(process) {