Browse Source

流程bug

asd26269546 1 year ago
parent
commit
29f7a7d7d3

+ 7 - 2
src/views/finance/fundManage/accountStatement/index.vue

@@ -97,7 +97,7 @@
     </el-dialog>
     <!-- 结汇 -->
     <el-dialog
-      title="结汇"
+      title="结汇" 
       v-if="settlementModal"
       v-model="settlementModal"
       width="600"
@@ -110,8 +110,13 @@
         :rules="rules"
         ref="submit"
       >
-
       </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="submitForm()" size="large"
+          >确 定</el-button
+        >
+      </template>
     </el-dialog>
     <el-dialog
       :title="modalType == 'add' ? '添加流水' : '编辑流水'"

+ 13 - 6
src/views/process/processConfig/vueFlow.vue

@@ -452,9 +452,12 @@ const gethandleObjectList = (e,data) => {
 						value: item.userId,
 					}
 				})
-				formData.data = {
-					...data,
+				if(data) {
+					formData.data = {
+						...data,
+					}
 				}
+				
 				if(!data) formData.data.handleObjectId = ''
 			})
 		
@@ -473,8 +476,10 @@ const gethandleObjectList = (e,data) => {
 						value: item.deptId,
 					}
 				})
-				formData.data = {
-					...data,
+				if(data) {
+					formData.data = {
+						...data,
+					}
 				}
 				if(!data) formData.data.handleObjectId = ''
 			})
@@ -495,8 +500,10 @@ const gethandleObjectList = (e,data) => {
 						value: item.roleId,
 					}
 				})
-				formData.data = {
-					...data,
+				if(data) {
+					formData.data = {
+						...data,
+					}
 				}
 				if(!data) formData.data.handleObjectId = ''
 			})