cloud-web-corejs 1.0.54-dev.505 → 1.0.54-dev.506

package/src/components/wf/wf.js

@@ -705,48 +705,51 @@ wfContentMixin = {
       });
     },
     async rejectWfTask(operateType) {
-      let that = getTarget(this);
-      var procInstId = this.wfInfo.procInstId;
-      var taskId = this.wfInfo.taskId;
-      var destinations = [];
-
-      await that.$http({
-        url: this.current_prefix + "/wf/getPreIncomeNodes",
-        data: {
-          stringOne: taskId,
-        },
-        method: "post",
-        //contentType: 'application/json;charset=utf-8',
-        async: false,
-        isLoading: true,
-        success: (resultMsg) => {
-          destinations = (resultMsg.objx || []).reverse();
-        },
-      });
+      this.handleReminderContent("rejectReminder", async ()=>{
+        let that = getTarget(this);
+        var procInstId = this.wfInfo.procInstId;
+        var taskId = this.wfInfo.taskId;
+        var destinations = [];
 
-      if (destinations == null) {
-        return false;
-      }
-      if (destinations.length == 0) {
-        that.$message({
-          message: this.$t2('无法驳回，没有目标节点', 'components.wf.rejectWarnMsg1'),
-          type: "error",
-          duration: 2 * 1000,
+        await that.$http({
+          url: this.current_prefix + "/wf/getPreIncomeNodes",
+          data: {
+            stringOne: taskId,
+          },
+          method: "post",
+          //contentType: 'application/json;charset=utf-8',
+          async: false,
+          isLoading: true,
+          success: (resultMsg) => {
+            destinations = (resultMsg.objx || []).reverse();
+          },
         });
-        return false;
-      }
-      this.operateType = operateType;
-      let rejectSubmitModel = null;
-      if (this.wfInfo.toNextNode === 1) {
-        rejectSubmitModel = this.wfInfo.toNextNode
-      } else {
-        rejectSubmitModel = this.wfInfo.toRejectNode == false ? 2 : null
-      }
-      this.rejectForm.rejectSubmitModel = rejectSubmitModel;
-      this.rejectForm.nodeId = destinations[0].nodeId;
-      this.rejectForm.opinion = "";
-      this.rejectNodes = destinations;
-      this.rejectDialogVisible = true;
+
+        if (destinations == null) {
+          return false;
+        }
+        if (destinations.length == 0) {
+          that.$message({
+            message: this.$t2('无法驳回，没有目标节点', 'components.wf.rejectWarnMsg1'),
+            type: "error",
+            duration: 2 * 1000,
+          });
+          return false;
+        }
+        this.operateType = operateType;
+        let rejectSubmitModel = null;
+        if (this.wfInfo.toNextNode === 1) {
+          rejectSubmitModel = this.wfInfo.toNextNode
+        } else {
+          rejectSubmitModel = this.wfInfo.toRejectNode == false ? 2 : null
+        }
+        this.rejectForm.rejectSubmitModel = rejectSubmitModel;
+        this.rejectForm.nodeId = destinations[0].nodeId;
+        this.rejectForm.opinion = "";
+        this.rejectNodes = destinations;
+        this.rejectDialogVisible = true;
+      })
+
     },
     subRejectForm() {
       let that = getTarget(this);
@@ -800,35 +803,70 @@ wfContentMixin = {
         },
       });
     },
-    openAgreeDialog(operateType) {
-      const done = () => {
-        this.operateType = operateType;
-        let that = getTarget(this);
-        this.agreeForm = {
-          opinion: this.$t2('同意', 'components.wf.defaultAgreeOption'),
-          nodeId: null,
-        };
-        this.agreeNodes = [];
-        that.$http({
-          url: this.current_prefix + "/wf/getNextOutgoingNodes",
+    handleReminderContent(scriptType, callback){
+      let that = getTarget(this);
+      that.$http({
+          url: this.current_prefix + "/wf/getReminderContent",
           data: {
-            stringOne: this.wfInfo.taskId,
+            scriptType,
+            taskId: this.wfInfo.taskId,
+            uuid: this.wfInfo.uuid,
           },
           method: "post",
-          async: false,
           isLoading: true,
+          errorMsg: false,
           success: (res) => {
-            let nodes = res.objx || [];
-            /*if (tq == true) {
-              nodes.reverse();
-            }*/
-            if (nodes.length) {
-              this.agreeForm.nodeId = nodes[0].nodeId;
+            if(res.objx){
+              that.$baseConfirm(res.objx).then(() => {
+                callback && callback();
+              });
+            }else{
+              callback && callback();
             }
-            this.agreeNodes = nodes;
-            this.agreeDialogVisible = true;
           },
-        });
+          error: (e) => {
+            if(e.response.status === 404){
+              callback && callback();
+            }else{
+              that.$errorMsg({
+                content: e.message,
+                type: 'error',
+              });
+            }
+          },
+      });
+    },
+    openAgreeDialog(operateType) {
+      const done = () => {
+        this.handleReminderContent("submitReminder", ()=>{
+          this.operateType = operateType;
+          let that = getTarget(this);
+          this.agreeForm = {
+            opinion: this.$t2('同意', 'components.wf.defaultAgreeOption'),
+            nodeId: null,
+          };
+          this.agreeNodes = [];
+          that.$http({
+            url: this.current_prefix + "/wf/getNextOutgoingNodes",
+            data: {
+              stringOne: this.wfInfo.taskId,
+            },
+            method: "post",
+            async: false,
+            isLoading: true,
+            success: (res) => {
+              let nodes = res.objx || [];
+              /*if (tq == true) {
+                nodes.reverse();
+              }*/
+              if (nodes.length) {
+                this.agreeForm.nodeId = nodes[0].nodeId;
+              }
+              this.agreeNodes = nodes;
+              this.agreeDialogVisible = true;
+            },
+          });
+        })
       }
       let wfConfig = this.wfConfig;
       if (wfConfig.onClickAgree) {
@@ -848,25 +886,7 @@ wfContentMixin = {
         done();
       }
     },
-    getTipMsg() {
-      let that = getTarget(this);
-      let wfConfig = this.wfConfig;
-      let wfActionTipConfig = wfConfig.wfActionTipConfig
-      let tipMsg = "";
-      if(wfActionTipConfig){
-        wfActionTipConfig.forEach((item) => {
-          if(item.operateType == this.operateType){
-            tipMsg = item.tipMsg || "";
-          }
-        })
-      }
-      if (this.formConfig.wfActionTipConfigEnabled) {
-        tipMsg = this.wfConfig.wfActionTipConfig || "";
-      } else {
-        tipMsg = that.$t2('是否同意该操作？', 'components.wf.defaultAgreeTipMsg');
-      }
-      return tipMsg;
-    },
+
     subAgreeHandle() {
       let that = getTarget(this);
       let nodeId = null;

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -120,6 +120,12 @@
               @change="changeWfEnabled"
             ></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('默认流程单据类型名称')">
+            <el-input
+              type="text"
+              v-model="designer.vueInstance.reportTemplate.objTypeName"
+            ></el-input>
+          </el-form-item>
           <el-form-item>
             <span slot="label"
               >流程主题
@@ -174,13 +180,6 @@
               <i class="el-icon-edit"></i>
             </a>
           </el-form-item>
-
-          <el-form-item :label="i18nt('默认流程单据类型名称')">
-            <el-input
-              type="text"
-              v-model="designer.vueInstance.reportTemplate.objTypeName"
-            ></el-input>
-          </el-form-item>
           <el-form-item :label="i18nt('引用流程的表单编码')">
             <el-input
               type="text"