修改管道展示,最后一个节点显示问题/处理无表单节点传参

zkqy-ui/src/views/bussiness/processMange.vue

@@ -191,6 +191,7 @@
             :formData="formData"
             :row="row"
             ref="myFormRef"
+            v-if="myForm"
           ></component>
           <!-- <CG1 ref="myFormRef"></CG1>
           <KC1 ref="myFormRef"></KC1> -->

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -121,7 +121,14 @@ export default {
             item.isNow = false;
           }
         });
+        // 当最后一个节点就是当前节点时置为完成状态
+        let lastNode = re.cardList[re.cardList.length - 1];
+        if (re.currentNodeKey == lastNode.nodeId) {
+          lastNode.isDone = true;
+          lastNode.isNow = false;
+        }
       });
+
       return res;
     },
   },

zkqy-ui/src/views/system/bpmnPro/components/bo-utils/getNodeMsg.js

@@ -106,6 +106,9 @@ function getNodeException(node, nodeObj) {
   if (nodeName.includes('-')) {
     nodeFormType = 'designForm';
     formKey = nodeName.split('-')[0]
+  } else {
+    nodeFormType = 'blankForm';
+    formKey = ''
   }
   if (node.getAttribute(`${prefix}:NormalScriptKey`)) {
 

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -866,6 +866,7 @@ export default {
     handleDelete(row, btnData) {
       let delIds = this.ids;
       let primary = camelCase(this.templateInfo.template?.primaryKey);
+      // let realyKey=
       this.addRealFieldName(row);
       if (row[primary] != undefined && row[primary] != null) {
         delIds = [];
@@ -949,12 +950,13 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       let primary = camelCase(this.templateInfo.template?.primaryKey);
+      let realyKey = camelCase(this.tableName + "_" + primary);
       if (this.ids.length > 0) {
         this.queryParams["execlMap"] = [];
         this.ids.forEach((item) => {
           this.queryParams.execlMap.push(
             this.tableList.find((ttem) => {
-              return ttem[primary] === item;
+              return ttem[realyKey] === item;
             })
           );
         });