@lambo-design/workflow-approve 1.0.0-beta.110 → 1.0.0-beta.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.110",
+  "version": "1.0.0-beta.112",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -13,7 +13,7 @@
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
     "@lambo-design/core": "^4.7.1-beta.171",
-    "@lambo-design/shared": "^1.0.0-beta.312"
+    "@lambo-design/shared": "^1.0.0-beta.316"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/portrait.vue

@@ -493,6 +493,7 @@ export default {
       permScope: '',
       organTreeType: '00',
       defaultOrganTreeType: '00',
+      ucAdapterType: 'x1',
       ruleValidate: {
         auditOpinion: [{ required: true, trigger: 'blur', message: '意见不能为空' }],
         assignee: [{ required: true, trigger: 'blur', message: '办理人不能为空' }],
@@ -579,6 +580,7 @@ export default {
   },
 
   mounted() {
+    this.getUcAdapterType()
     this.calculateDimensions();
     // 监听窗口大小变化
     window.addEventListener('resize', this.handleWindowResize);
@@ -1162,6 +1164,18 @@ export default {
       }
       this.portraitWidth = this.width
     },
+    getUcAdapterType(){
+      const self = this
+      ajax.get(self.smartFlowServerContext + '/anon/systemConfig/getSystemConfig').then(function (resp) {
+        const result = resp.data;
+        if (result && result.code === '200') {
+          self.ucAdapterType = result.data.ucAdapterType
+          self.defaultOrganTreeType = self.ucAdapterType === 'sc' ? 'default' : '00'
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
     initData() {
       if (!this.isDetail) {
         this.getTodoTask()
@@ -1199,7 +1213,7 @@ export default {
               .then(resp => {
                 let data = resp.data.data.rows
                 self.permScope = data[0].permScope
-                self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : '00'
+                self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : self.ucAdapterType === 'sc' ? 'default' : '00'
                 self.getNodeOrganTreeType(procType)
               }).catch(err => {
             console.log(err)

package/src/workflow-diagram.vue

@@ -184,18 +184,20 @@ export default {
       type: Array,
       default: () => {
         return [
-          {
-            title: '序号',
-            width: 60,
-            render: (h, {row, index}) => {
-              // 子节点不显示序号
-              if (row._isChildNode) {
-                return h('span', '');
-              }
-              return h('span', index + 1);
-            }
-          },
-          {title: '节点', key: 'taskName', minWidth: 130, tree: true},
+          // {
+          //   title: '序号',
+          //   width: 60,
+          //   render: (h, {row, index}) => {
+          //     // 子节点不显示序号
+          //     if (row._isChildNode) {
+          //       return h('span', '');
+          //     }
+          //     return h('span', index + 1);
+          //   }
+          // },
+          // {title: '节点', key: 'taskName', minWidth: 130, tree: true},
+          {title: '序号', type: 'index', width: 60},
+          {title: '节点', key: 'taskName', minWidth: 130},
           {title: '办理人', key: 'auditName', minWidth: 150, tooltip: true},
           {
             title: '结果', key: 'auditResult', minWidth: 150,