Merge branch 'develop' into release-test

@@ -45,13 +45,6 @@ const tableFields = ref([
 const deploymentId = ref('');
 
 onMounted(() => {
-  getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
-    if (res.code == proxy.$passCode) {
-      deploymentId.value = res.data;
-    } else {
-      proxy.$ElMessage.error(res.msg);
-    }
-  })
 });
 
 onActivated(() => {
@@ -412,6 +405,7 @@ const dialogInfo = ref({
 const dialogBtnClick = (btn, info) => {
   if (btn.value == 'submit') {
     dialogInfo.value.footer.btns[1].loading = true;
+    let submitFunc = () => {
       getProcessNodesPromise({
         deploymentId: deploymentId.value,
         processInstanceId: null,
@@ -480,6 +474,20 @@ const dialogBtnClick = (btn, info) => {
           ElMessage.error(res.msg);
         }
       })
+    }
+    if (deploymentId.value) {
+      submitFunc();
+    } else {
+      getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+        if (res.code == proxy.$passCode) {
+          deploymentId.value = res.data;
+          submitFunc();
+        } else {
+          dialogInfo.value.footer.btns[1].loading = false;
+          proxy.$ElMessage.error(res.msg);
+        }
+      })
+    }
   } else if (btn.value == 'cancel') {
     dialogInfo.value.visible = false;
   }

@@ -96,13 +96,6 @@ onBeforeMount(() => {
   //     ElMessage.error(res.msg);
   //   }
   // })
-  getCamundaDeploymentId('10019', userData.tenantGuid, userData.staffGuid).then((res: any) => {
-    if (res.code == proxy.$passCode) {
-      deploymentId.value = res.data;
-    } else {
-      proxy.$ElMessage.error(res.msg);
-    }
-  })
 });
 
 onActivated(() => {
@@ -680,7 +673,7 @@ const dialogInfo = ref({
   footer: {
     btns: [
       { type: "default", label: "取消", value: "cancel" },
-      { type: "primary", label: "确定", value: "submit" },
+      { type: "primary", label: "确定", value: "submit", loading: false },
     ],
   },
 });
@@ -738,6 +731,7 @@ const reSubmitPromise: any = ref(null);
 const dialogBtnClick = (btn, info) => {
   console.log('btn', btn, info);
   if (btn.value == 'submit') {
+    let submitFunc = () => {
       getProcessNodesPromise({
         deploymentId: deploymentId.value,
         processInstanceId: null,
@@ -848,6 +842,19 @@ const dialogBtnClick = (btn, info) => {
           }
         });
       })
+    }
+    if (deploymentId.value) {
+      submitFunc();
+    } else {
+      getCamundaDeploymentId('10019', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+        if (res.code == proxy.$passCode) {
+          deploymentId.value = res.data;
+          submitFunc();
+        } else {
+          proxy.$ElMessage.error(res.msg);
+        }
+      })
+    }
   } else if (btn.value == 'cancel') {
     dialogInfo.value.visible = false;
   }

@@ -341,11 +341,11 @@ const financingTableInfo = ref({
       // columClass: 'text_btn',
       // value: "detail",
     },
-    // { label: "授信日期", field: "creditGrantingTime", width: 110 },
+    { label: "调用数", field: "callApiNumber", width: 100, align: "right", },
     {
       label: "调用次数",
       field: "callApiCount",
-      width: 140,
+      width: 100,
       align: "right",
       // getName: (scope) => {
       //   return changeNum(scope.row.creditGrantingMoney ?? 0, 2, true) + '万元';