Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/views/bpmprocess/index.vue

@@ -520,7 +520,7 @@ export default {
               try {
                 let data = {
                   processId: row.processId,
-                  note: instance.inputValue.trim(),
+                  remark: instance.inputValue.trim(),
                 };
                 let res = await bpmBackups(data);
                 if (res.code == 200) {

ruoyi-ui/src/views/system/bpmnPro/components/Toolbar/tools/Save.vue

@@ -91,7 +91,7 @@ export default {
       let _this = this;
       let formData = _this.formData() || {}; // 当前流程表单详细数据
       let processJsonObj = await this.getProcessJson(); // xml标签转换json
-      // console.log(processJsonObj);
+      console.log(processJsonObj);
       // this.saveNodeMsg(processJsonObj);
       // return;
       let validateRes = formDataValidate(processJsonObj);
@@ -100,17 +100,16 @@ export default {
         return;
       }
       formData.processJson = JSON.stringify(processJsonObj);
-      let { rootElements, warnings } = processJsonObj.rootElement;
+      let { rootElements } = processJsonObj.rootElement;
+      let { warnings } = processJsonObj;
       formData.processKey = rootElements[0].id; // 流程编号
       formData.processName = rootElements[0].name; // 流程名称
       if (warnings && Object.keys(warnings).length) {
         let prefix = getProcessEngine();
-        warnings[`${prefix}:note`] &&
-          (formData.note = warnings[`${prefix}:note`]);
-        warnings[`${prefix}:startEventType`] &&
-          (formData.note = warnings[`${prefix}:startEventType`]);
-        warnings[`${prefix}:bpmType`] &&
-          (formData.note = warnings[`${prefix}:bpmType`]);
+        formData.note =
+          warnings.find((item) => item.property == prefix + ":note")?.value ||
+          "";
+        console.log(warnings.find((item) => item.property == prefix + ":note"));
       }
       formData.processType = "0"; //流程类型
       // 获取xml标签内容标签内容