cloud-module-bpm 6.13.2 → 6.13.3

package/packages/bpm-sign-dialog/Tree.vue

@@ -1,7 +1,10 @@
 <template>
-<div style="height:100%;width:100%">
-  <el-row>
-      <el-col :span="24" style="padding: 4px;">
+  <div style="height:100%;width:100%">
+    <el-row>
+      <el-col
+        :span="24"
+        style="padding: 4px;"
+      >
         <el-input
           placeholder="请输入名称或编码"
           v-model="searchName"
@@ -13,44 +16,61 @@
         ></el-input>
       </el-col>
     </el-row>
-    <el-row style="height:calc(100% - 38px);overflow-y: auto;">
+    <el-row style="overflow-y: auto;height:91%">
       <div>
-  <el-tree
-    v-show="isShow"
-    :data="treeNode"
-    style="height:395px!important;"
-    class="flow-tree"
-    ref="tree"
-    node-key="id"
-    :props="treeProps"
-    @node-click="handelrNodeClick"
-    highlight-current
-    :default-expanded-keys="defaultExpandedKeys"
-  >
-    <span class="custom-tree-node cell-hidden" slot-scope="{ node, data }">
-      <span v-if="data.type == 0" class="iconfont icon-jigou"></span>
-      <span v-else class="iconfont icon-bumenkaoqin"></span>
-      <span :title="node.label">{{ node.label }}</span>
-    </span>
-    
-  </el-tree>
-  <el-tree
-     v-show="!isShow"
-    :data="treeNodeSearch"
-    ref="treeSearch"
-    node-key="id"
-    :props="treeProps"
-    @node-click="handelrNodeClick"
-    highlight-current
-    :default-expanded-keys="defaultExpandedKeys"
-  >
-    <span class="custom-tree-node span-ellipsis" slot-scope="{ node, data }">
-      <span v-if="data.dLevel == 0" class="iconfont icon-jigou"></span>
-      <span v-else class="iconfont icon-bumenkaoqin"></span>
-      <span :title="node.label">{{ node.label }}</span>
-    </span>
-    </el-tree>
-         </div>
+        <el-tree
+          v-show="isShow"
+          :data="treeNode"
+          class="flow-tree"
+          ref="tree"
+          node-key="id"
+          :props="treeProps"
+          @node-click="handelrNodeClick"
+          highlight-current
+          :default-expanded-keys="defaultExpandedKeys"
+        >
+          <span
+            class="custom-tree-node cell-hidden"
+            slot-scope="{ node, data }"
+          >
+            <span
+              v-if="data.type == 0"
+              class="iconfont icon-jigou"
+            ></span>
+            <span
+              v-else
+              class="iconfont icon-bumenkaoqin"
+            ></span>
+            <span :title="node.label">{{ node.label }}</span>
+          </span>
+
+        </el-tree>
+        <el-tree
+          v-show="!isShow"
+          :data="treeNodeSearch"
+          ref="treeSearch"
+          node-key="id"
+          :props="treeProps"
+          @node-click="handelrNodeClick"
+          highlight-current
+          :default-expanded-keys="defaultExpandedKeys"
+        >
+          <span
+            class="custom-tree-node span-ellipsis"
+            slot-scope="{ node, data }"
+          >
+            <span
+              v-if="data.dLevel == 0"
+              class="iconfont icon-jigou"
+            ></span>
+            <span
+              v-else
+              class="iconfont icon-bumenkaoqin"
+            ></span>
+            <span :title="node.label">{{ node.label }}</span>
+          </span>
+        </el-tree>
+      </div>
     </el-row>
   </div>
 </template>
@@ -63,27 +83,27 @@ export default {
     "el-container": Container
   },
   //初始化数据
-  data() {
+  data () {
     return {
       height: 0,
       orgUrl: "/api/identity/bpm-dept/tree-by-deptcodes", //组织机构树接口
-      orgListUrl: "/cloud-system-manage/api/ou/org/list", //组织机构列表筛选接口
+      orgListUrl: "/api/identity/bpm-dept/tree-by-search", //组织机构列表筛选接口
       treeNode: [],
       searchName: '',
       currentPage: 1,
       pageSize: 10,
       treeNodeSearch: [],
       defaultExpandedKeys: [],
-      
+
       treeProps: {
         children: "children",
         label: "name",
         id: "id"
       },
-      resultData:{
+      resultData: {
         nextNodes: [],
       },
-      ruleEngine:{},
+      ruleEngine: {},
       isShow: true
     };
   },
@@ -97,55 +117,76 @@ export default {
   //方法
   methods: {
     //树节点点击事件
-    handelrNodeClick(treeNode) {
-      this.EventBus.$emit("refresh-source-grid", treeNode);
+    handelrNodeClick (treeNode) {
+      this.EventBus.$emit("refresh-source-grid-sign", treeNode);
     },
-    restart(){
-    let _this = this;
-    let param = {
+    restart () {
+      let _this = this;
+      let param = {
         page: this.currentPage,
         rows: this.pageSize,
       };
-    _this.EventBus.$emit('refresh-source-grid', param);
+      this.treeNodeSearch = [];
+      this.isShow = true;
+      let deptCodes = [];
+      this.opt.forEach(bpmUser => {
+        if (bpmUser.deptCode && !deptCodes.includes(bpmUser.deptCode)) {
+          deptCodes.push(bpmUser.deptCode);
+        }
+      });
+      axios['bpm-engine']
+        .post(this.orgUrl, { deptCodes: deptCodes.join(',') })
+        .then(function (res) {
+          _this.treeNode = res.data;
+          _this.defaultExpandedKeys.push(res.data[0].id);
+        })
+        .catch(function (err) {
+          console.log(err);
+        });
+      _this.EventBus.$emit('refresh-source-grid', param);
     },
-    searchTree() {
+    searchTree () {
       let _this = this;
       if (_this.searchName == null || _this.searchName == '') {
         _this.treeNodeSearch = [];
         _this.isShow = true;
-        _this.$nextTick(() => {
-          _this.$refs.tree.setCurrentKey(_this.treeNode[0].id);
-        });
-        _this.handelrNodeClick(_this.treeNode[0]);
         return;
       }
-      axios['default']
+
+      let deptCodes = [];
+      _this.opt.alldeptcodes.forEach(bpmUser => {
+        if (bpmUser.deptCode && !deptCodes.includes(bpmUser.deptCode)) {
+          deptCodes.push(bpmUser.deptCode);
+        }
+      });
+      _this.isShow = false;
+      axios['bpm-engine']
         .post(this.orgListUrl, {
           search: this.searchName,
-          page: 1,
-          rows: 1000
+          deptCodes: deptCodes.join(',')
         })
-        .then(function(res) {
-          if (res.data.total > 0) {
-            _this.treeNodeSearch = res.data.rows;
+        .then(function (res) {
+
+          if (res.data.length > 0) {
+            _this.treeNodeSearch = res.data;
             _this.$nextTick(() => {
-              _this.$refs.treeSearch.setCurrentKey(res.data.rows[0].id);
+              _this.$refs.treeSearch.setCurrentKey(res.data[0].id);
             });
-            _this.handelrNodeClick(res.data.rows[0]);
+            _this.handelrNodeClick(res.data[0]);
           } else {
             _this.treeNodeSearch = [];
           }
-          _this.isShow = false;
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
+
     }
   },
   //页面渲染之前调用方法 函数
-  created() {
+  created () {
   },
-  mounted() {
+  mounted () {
     let _this = this;
     let deptCodes = [];
     this.opt.alldeptcodes.forEach(bpmUser => {
@@ -155,25 +196,25 @@ export default {
     });
     axios['bpm-engine']
       .post(this.orgUrl, { deptCodes: deptCodes.join(',') })
-      .then(function(res) {
+      .then(function (res) {
         _this.treeNode = res.data;
+        _this.EventBus.$emit('refresh-source-grid-sendRead', res.data[0]);
         _this.defaultExpandedKeys.push(res.data[0].id);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         console.log(err);
       });
-
-      this.EventBus.$on('reset-checked-node', () => {
-        _this.searchName = '';
-        if (_this.$refs.tree) {
-          _this.$refs.tree.setCurrentKey(_this.$refs.tree.defaultExpandedKeys[0]);
-          _this.EventBus.$emit('refresh-source-grid', _this.$refs.tree.getCurrentNode());
-        }
-      });
+    this.EventBus.$on('reset-checked-node', () => {
+      _this.searchName = '';
+      if (_this.$refs.tree) {
+        _this.$refs.tree.setCurrentKey(_this.$refs.tree.defaultExpandedKeys[0]);
+        _this.EventBus.$emit('refresh-source-grid', _this.$refs.tree.getCurrentNode());
+      }
+    });
   },
   //页面渲染完成调用方法 函数
   watch: {
-    'opt.alldeptcodes'(old, newVal) {
+    'opt.alldeptcodes' (old, newVal) {
       let _this = this;
       let deptCodes = [];
       this.opt.alldeptcodes.forEach(bpmUser => {
@@ -183,19 +224,16 @@ export default {
       });
       axios['bpm-engine']
         .post(this.orgUrl, { deptCodes: deptCodes.join(',') })
-        .then(function(res) {
+        .then(function (res) {
           _this.treeNode = res.data;
+          _this.EventBus.$emit('refresh-source-grid-sendRead', res.data[0]);
           _this.defaultExpandedKeys.push(res.data[0].id);
-          _this.$nextTick(() => {
-            _this.$refs.tree.setCurrentKey(res.data[0].id);
-          });
-          _this.handelrNodeClick(res.data[0]);
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
-        this.ruleEngine = this.opt.temRuleEngine;
-      }
+      this.ruleEngine = this.opt.temRuleEngine;
+    }
   }
 
 };

package/packages/bpm-sign-dialog/bpm-next-node.vue

@@ -1,8 +1,8 @@
 <template>
   <el-container>
-    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;">
+    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;background: #e8ecf3">
       <el-container>
-        <el-aside style="height:456px;width: 40%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
+        <el-aside style="height:456px;width: 40%;max-width: 400px;margin:0px;border-radius: 0px;">
           <v-tree :opt="nextNode" />
         </el-aside>
         <el-main style="height:456px;width:45%;padding: 0px;margin-left:2px">
@@ -11,7 +11,10 @@
       </el-container>
     </el-aside>
     <el-main style="height:456px;padding:0px;padding-bottom: 0px;width:35%;margin-left:10px">
-      <v-select-grid :opt="nextNode" ref="selectGrid"/>
+      <v-select-grid
+        :opt="nextNode"
+        ref="selectGrid"
+      />
     </el-main>
   </el-container>
 </template>
@@ -37,19 +40,19 @@ export default {
     'el-main': Main,
     'el-container': Container
   },
-  data() {
+  data () {
     return {
       opt: {
         maxHeight: '483px'
       },
-      ruleEngine:''     //提供引擎传值参数
+      ruleEngine: ''     //提供引擎传值参数
     };
   },
-  created() {
+  created () {
     this.maxHeight = window.outerHeight > 900 ? '483px' : '361px';
   },
-  methods:{
-    clearSelectData(){
+  methods: {
+    clearSelectData () {
       this.$refs.selectGrid.refre();
     }
   }