补充提交

zkqy-ui/.env.development

@@ -11,10 +11,10 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #数据引擎模块IP
-VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
+VUE_APP_BASE_API2 = 'http://192.168.110.76:8099/'
 
 #表单引擎模块IP
-VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'
+VUE_APP_BASE_API3 = 'http://192.168.110.76:8088/'
 
 #流程引擎模块IP
-VUE_APP_BASE_API4 = 'http://192.168.110.59:8055/'
+VUE_APP_BASE_API4 = 'http://192.168.110.76:8055/'

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

@@ -18,7 +18,7 @@
           <el-form-item label="开始时间" size="normal">
             <el-date-picker
               v-model="queryParams.startDate"
-              type="year"
+              type="date"
               size="normal"
               placeholder="选择日期时间"
             >

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

@@ -29,7 +29,11 @@
           </div>
           <div class="search-input">
             <el-input placeholder="请输入..." v-model="queryString">
-              <el-button slot="append" @click="getList" icon="el-icon-search"></el-button>
+              <el-button
+                slot="append"
+                @click="getList"
+                icon="el-icon-search"
+              ></el-button>
             </el-input>
           </div>
         </div>
@@ -152,6 +156,11 @@ export default {
     // 合并两个节点数组
     nodeHandler(processList) {
       let res = processList.map((item, index) => {
+        console.log(
+          JSON.parse(JSON.stringify(item.cardList)),
+          JSON.parse(JSON.stringify(item.doneNodeList)),
+          item.currentNodeKey
+        );
         item.doneNodeList.forEach((node) => {
           Object.assign(node, {
             isDone: true,
@@ -174,6 +183,8 @@ export default {
         let currentIndex = item.cardList.findIndex(
           (node) => node.nodeId == item.currentNodeKey
         );
+        console.log(currentIndex, item.cardList.length);
+        // while(currentIndex<item.cardList.length){}
         for (let i = currentIndex; i < item.cardList.length; i++) {
           if (i == currentIndex) {
             item.cardList[i].isNow = true;
@@ -187,8 +198,9 @@ export default {
             item.cardList[i].isNow = false;
           }
         }
-        item.cardList.splice(0, currentIndex + 1, ...item.doneNodeList);
-
+        item.cardList.splice(0, currentIndex + 1);
+        item.cardList.unshift(...item.doneNodeList);
+        console.log(item.cardList);
         item.cardList.forEach((node, index) => {
           node.num = index + 1;
         });

zkqy-ui/src/views/system/bpmnPro/components/Panel/index.vue

@@ -81,6 +81,7 @@ export default {
       currentElementId: undefined,
       customTranslate,
       renderComponents: [],
+      waitingComponents: [],
     };
   },
   provide() {
@@ -128,7 +129,18 @@ export default {
   watch: {
     myProcessType: {
       handler(val) {
-        console.log(val, 1111);
+        //0:工业类型  1:OA类型
+        switch (val) {
+          case "0":
+            // this.waitingComponents.splice(0, this.waitingComponents.length); // 清空
+            this.waitingComponents = [ElementGenerations];
+            break;
+          case "1":
+            break;
+
+          default:
+            break;
+        }
       },
       immediate: true,
       deep: true,
@@ -181,7 +193,6 @@ export default {
     setCurrentComponents(element) {
       this.renderComponents.splice(0, this.renderComponents.length); // 清空
       // 重设
-      this.renderComponents.push(ElementGenerations);
       // this.renderComponents.push(ElementDocumentations); //附加文档
       // isCanbeConditional(element) &&
       //   this.renderComponents.push(ElementConditional);
@@ -191,29 +202,36 @@ export default {
       // isExecutable(element) &&
       //   this.renderComponents.push(ElementExecutionListeners);
       // isAsynchronous(element) &&
-      !isProcess(element) &&
-        !isStart(element) &&
-        !isEnd(element) &&
-        this.renderComponents.push(ElementAsyncContinuations); //节点前后执行的数据
       // isStartInitializable(element) &&
       //   this.renderComponents.push(ElementStartInitiator);
       // this.renderComponents.push(ElementExtensionField);
       // 添加执行表单
       // isTaskOrUserTask(element) &&
       //   this.renderComponents.push(ElementExecuteForm);//执行表单
-      !isProcess(element) && this.renderComponents.push(ElementNormalTask); //正常节点
-      !isProcess(element) &&
-        !isStart(element) &&
-        !isEnd(element) &&
-        this.renderComponents.push(ElementUnusualTasks); //可处理异常
-      isUserTask(element) && this.renderComponents.push(ElementExecuteUser);
-      !isProcess(element) &&
-        !isStart(element) &&
-        !isEnd(element) &&
-        this.renderComponents.push(ElementExcuteType);
 
       // !isProcess(element) && this.renderComponents.push(ElementBeforeNode);
       // !isProcess(element) && this.renderComponents.push(ElementAfterNode);
+      switch (this.myProcessType) {
+        case "0": //工业类型
+          this.renderComponents.push(ElementGenerations); //常规信息
+          !isProcess(element) &&
+            !isStart(element) &&
+            !isEnd(element) &&
+            this.renderComponents.push(ElementAsyncContinuations); //节点前后执行的数据
+          !isProcess(element) && this.renderComponents.push(ElementNormalTask); //正常节点
+          !isProcess(element) &&
+            !isStart(element) &&
+            !isEnd(element) &&
+            this.renderComponents.push(ElementUnusualTasks); //可处理异常
+          isUserTask(element) && this.renderComponents.push(ElementExecuteUser);
+          !isProcess(element) &&
+            !isStart(element) &&
+            !isEnd(element) &&
+            this.renderComponents.push(ElementExcuteType); //执行类型
+          break;
+        default:
+          break;
+      }
     },
     // 获取所有脚本列表
     async getAllScriptList() {

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

@@ -15,6 +15,7 @@
       append-to-body
       destroy-on-close
       :center="true"
+      :close-on-click-modal="false"
     >
       <el-form
         :model="processForm"

zkqy-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.59:8080`,
+        target: `http://192.168.110.76:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''