Merge branch 'master' of http://175.27.169.173:10880/zkqy-sass-platform/mec-cloud_-intelligent-manufacturing_crm

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -1157,6 +1157,10 @@ export default {
             label: "表单组",
             value: "dragFormGroup",
           },
+          {
+            label: "计算表单",
+            value: "calculateForm",
+          },
           {
             label: "其它",
             value: "other",
@@ -1165,7 +1169,7 @@ export default {
       }
     },
     formList() {
-      if (this.btnGroupFormData.btnFormType === "dragForm") {
+      if (this.btnGroupFormData.btnFormType === "dragForm" || this.btnGroupFormData.btnFormType === "calculateForm") {
         return this.formOptions;
       } else if (this.btnGroupFormData.btnFormType === "dragFormGroup") {
         return this.groupFormOptions;
@@ -1215,6 +1219,10 @@ export default {
             value: "TOAST",
             label: "消息提示",
           },
+          {
+            value:"CALCULATE",
+            label:"计算合计",
+          },
         ];
       } else {
         return [