hujunwei@agilestar.cn 1 год назад
Родитель
Сommit
bfa6283c63
2 измененных файлов с 85 добавлено и 79 удалено
  1. 60 54
      src/components/workflowBase.vue
  2. 25 25
      src/config/dev.js

+ 60 - 54
src/components/workflowBase.vue

@@ -492,57 +492,36 @@ export default {
           fresourceId: this.requestForm.fresourceId,
         },
       }).then((res) => {
-      });
-
-      console.log(this.list);
-      console.log(this.requestForm);
-
-      let createdId = "createId";
-      let id =
-        e.nextShapes[0].properties.documentation.indexOf(createdId) != -1
-          ? this.list.createId
-          : e.nextShapes[0].properties.documentation;
-      console.log(id);
-
-      let paramsJson = {}
-      if (this.requestForm.processDefinitionKey == 'BOMC_process' || this.requestForm.processDefinitionKey == 'ZHQX_process' || this.requestForm.processDefinitionKey == 'ZYSQ_process') {
-        paramsJson.proposerType = this.list.proposerType
-      }
-      if (this.requestForm.processDefinitionKey == 'YHBG_process') {
-        paramsJson.changeType = this.list.changeType
-      }
-      // if (this.list.proposerType) {
-      //   paramsJson.proposerType = this.list.proposerType
-      // }
-      // if (this.list.changeType) {
-      //   paramsJson.changeType = this.list.changeType
-      // }
-      this.$http({
-        url: "/market/api/user/info/queryNodePers?params=" + id,
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: {
-          paramsJson: JSON.stringify(paramsJson),
-          tableName: this.requestForm.processDefinitionKey,
-          fresourceId: this.requestForm.fresourceId,
-          resourceid: this.resourceId,
-        },
-      }).then((res) => {
-        console.log(status);
-        if (status === 2) {
-          // this.treeCopyList = res.data; //抄送
-          //  this.$refs.defTrees.treeList = res.data;
-        } else {
-          this.treeList = res.data; //抄送
-          // this.$refs.defTree.treeList = res.data;
-          console.log(this.treeList);
+        if (res.data.length > 0) {
+          for (var key in JSON.parse(res.data[0].paramsJson)) {
+            console.log(key, JSON.parse(res.data[0].paramsJson)[key])
+          }
+          console.log(key)
+        }
+        // console.log(this.list);
+        // console.log(this.requestForm);
+
+        let createdId = "createId";
+        let id =
+          e.nextShapes[0].properties.documentation.indexOf(createdId) != -1
+            ? this.list.createId
+            : e.nextShapes[0].properties.documentation;
+        console.log(id);
+
+        let paramsJson = {}
+        // if (this.requestForm.processDefinitionKey == 'BOMC_process' || this.requestForm.processDefinitionKey == 'ZHQX_process' || this.requestForm.processDefinitionKey == 'ZYSQ_process') {
+        //   paramsJson.proposerType = this.list.proposerType
+        // }
+        // if (this.requestForm.processDefinitionKey == 'YHBG_process') {
+        //   paramsJson.changeType = this.list.changeType
+        // }
+        if (res.data.length > 0) {
+          if (this.requestForm.processDefinitionKey == res.data[0].tableName) {
+            paramsJson[key] = this.list[key]
+          }
         }
-      });
-      if (this.copyStatus == true) {
         this.$http({
-          url: "/market/api/user/info/queryNodePers?params=" + e.nextShapes[0].properties.formkeydefinition,
+          url: "/market/api/user/info/queryNodePers?params=" + id,
           method: "post",
           headers: {
             "Content-Type": "application/json",
@@ -551,16 +530,43 @@ export default {
             paramsJson: JSON.stringify(paramsJson),
             tableName: this.requestForm.processDefinitionKey,
             fresourceId: this.requestForm.fresourceId,
-            resourceId: this.resourceId,
+            resourceid: this.resourceId,
           },
         }).then((res) => {
           console.log(status);
-          this.treeCopyList = res.data; //抄送
-
+          if (status === 2) {
+            // this.treeCopyList = res.data; //抄送
+            //  this.$refs.defTrees.treeList = res.data;
+          } else {
+            this.treeList = res.data; //抄送
+            // this.$refs.defTree.treeList = res.data;
+            console.log(this.treeList);
+          }
         });
-      } else {
+        if (this.copyStatus == true) {
+          this.$http({
+            url: "/market/api/user/info/queryNodePers?params=" + e.nextShapes[0].properties.formkeydefinition,
+            method: "post",
+            headers: {
+              "Content-Type": "application/json",
+            },
+            data: {
+              paramsJson: JSON.stringify(paramsJson),
+              tableName: this.requestForm.processDefinitionKey,
+              fresourceId: this.requestForm.fresourceId,
+              resourceId: this.resourceId,
+            },
+          }).then((res) => {
+            console.log(status);
+            this.treeCopyList = res.data; //抄送
+
+          });
+        } else {
+
+        }
+      });
+
 
-      }
     },
     //转派按钮方法
     clickTransfer(e) {

+ 25 - 25
src/config/dev.js

@@ -40,32 +40,32 @@ let dev = {
     BASE_URL: "http://127.0.0.1:8080", //本地环境
     BASE_API: "http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL: "http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId: 'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
-    provincialWorkOrderfresourceId: '08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
-    riskMaterialsfresourceId: 'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
+    provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
+    provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
+    riskMaterialsfresourceId: 'canvas',//风险防控
     materialApplicationfresourceId:'b58e5e25-ce13-11ed-afb6-e00084564cce',//宣传物料省
-    materialApplicationdsfresourceId:'cd072057-ce13-11ed-afb6-e00084564ce',//宣传物料地市
-    accountApplicationfresourceId: 'b3e6cc47-b1a9-11ed-886f-d6cd97160e00',//账号申请流程
-    accountdelfresourceId: '6a5fc7b5-b290-11ed-886f-d6cd97160e00',//账号删除
-    accountPermissionsfresourceId: '14c60ff0-b1a8-11ed-886f-d6cd97160e00',//账号权限申请流程
-    aqbgsyListfresourceId: '014cf465-b31c-11ed-886f-d6cd97160e00',//安全报告审阅
-    klhfsqList: '4a9e20e8-b33c-11ed-886f-d6cd97160e00',//口令恢复申请流程
-    rltzjlList: '7395620f-b33d-11ed-886f-d6cd97160e00',//容量调整记录流程
-    sjkdbList: '78e1edce-b319-11ed-886f-d6cd97160e00',//数据库导表流程
-    tyshList: '345a2955-b321-11ed-886f-d6cd97160e00',//通用审核流程
-    userList: '65791a1e-b1ac-11ed-886f-d6cd97160e00',//用户清单流程
-    internetAssessment: '87753452-c2f3-11ed-9c8b-d6cd97160e00',//互联网电视
-    authoriZation: '1db52dc3-b328-11ed-886f-d6cd97160e00',//口令授权
-    backupRequire: '4e2aaa61-b339-11ed-886f-d6cd97160e00',//备份需求
-    emergencyPlan: '238f139e-b28f-11ed-886f-d6cd97160e00',//应急预案
-    internetAccess: '2c4fd13a-b32a-11ed-886f-d6cd97160e00',//互联网端口
-    resourceApply: '569ffe50-b25a-11ed-886f-d6cd97160e00',//资源申请
-    securityAudit: 'd7dd8e5e-b320-11ed-886f-d6cd97160e00',//安全审计
-    userChange: 'c4624dbc-b322-11ed-886f-d6cd97160e00',//用户使用者变更
-    bfsjList: '524e01f7-b25d-11ed-886f-d6cd97160e00',//备份数据
-    docAppr: '47b27979-b250-11ed-886f-d6cd97160e00',//文件审批流程
-    firewall: '9d7c2f92-b251-11ed-886f-d6cd97160e00',//防火墙
-    opcode: 'b79206a9-b258-11ed-886f-d6cd97160e00',//opcode
+    materialApplicationdsfresourceId:'cd072057-ce13-11ed-afb6-e00084564cce',//宣传物料地市
+    authoriZation: 'a4c88c4e-d99e-11ed-8255-e00084564cce',//口令授权
+    backupRequire: 'b5c62d50-d99d-11ed-8255-e00084564cce',//备份需求
+    emergencyPlan: '8bcdfa43-d9a0-11ed-8255-e00084564cce',//应急预案
+    internetAccess: '5e83a807-d99e-11ed-8255-e00084564cce',//互联网端口
+    resourceApply: '428f1a81-d9a1-11ed-8255-e00084564cce',//资源申请
+    securityAudit: '99fa2bcc-d99f-11ed-8255-e00084564cce',//安全审计
+    userChange: 'e6eaf005-d99e-11ed-8255-e00084564cce',//用户使用者变更
+    bfsjList: 'f458d35a-d9a0-11ed-8255-e00084564cce',//备份数据
+    accountApplicationfresourceId: '27a9dbbf-d742-11ed-8255-e00084564cce',//账号申请流程
+    accountdelfresourceId: '8a519886-d742-11ed-8255-e00084564cce',//账号删除
+    accountPermissionsfresourceId: '2e508b91-d741-11ed-8255-e00084564cce',//账号权限申请流程
+    aqbgsyListfresourceId: '19bed1f4-d743-11ed-8255-e00084564cce',//安全报告审阅
+    klhfsqList: '9f3ab9d2-d743-11ed-8255-e00084564cce',//口令恢复申请流程
+    rltzjlList: 'd38ce419-d743-11ed-8255-e00084564cce',//容量调整记录流程
+    sjkdbList: 'd874ccdd-d742-11ed-8255-e00084564cce',//数据库导表流程
+    tyshList: '5b87cb0b-d743-11ed-8255-e00084564cce',//通用审核流程
+    userList: '81bc22d8-d741-11ed-8255-e00084564cce',//用户清单流程
+    internetAssessment: '433402bb-d52d-11ed-afb6-e00084564cce',//互联网电视
+    docAppr: '917d8bf9-d918-11ed-8255-e00084564cce',//文件审批流程
+    firewall: '3c3df7fb-d918-11ed-8255-e00084564cce',//防火墙
+    opcode: '6b9e1cb2-d918-11ed-8255-e00084564cce',//opcode
 }
 let test = {
     TITLE: '测试环境',