cloud-module-bpm 6.13.2 → 6.13.3

package/packages/bpm-user-select-dialog/SourceGrid.vue

@@ -1,27 +1,29 @@
 <template>
   <div>
-    <el-row justify="space-between" style="padding: 5px;">
+    <el-row
+      justify="space-between"
+      style="padding: 5px;"
+    >
       <el-col
         :span="7"
         style="float: left;margin-top: 5px;padding-left: 2px;"
-        >{{ $t('base.list_alternatives') }}</el-col
+      >{{ $t('base.list_alternatives') }}</el-col>
+      <el-col
+        :span="17"
+        style="float:right;"
       >
-      <el-col :span="17" style="float:right;">
         <el-input
-          class="custom_input_1"
           placeholder="请输入姓名或编码"
           v-model="searchName"
           clearable
           @change="searchGridData"
-          @keyup.enter.native="searchGridData"
-          suffix-icon="el-icon-search"
         >
-          <!-- <el-button
+          <el-button
             class="el-icon-search-button"
             slot="append"
             icon="el-icon-search"
             @click="searchGridData"
-          ></el-button> -->
+          ></el-button>
         </el-input>
       </el-col>
     </el-row>
@@ -44,9 +46,16 @@
         type="selection"
         v-if="notOnlyApprove"
       ></el-table-column>
-      <el-table-column prop="name" :label="$t('base.user.name')" fit="true">
+      <el-table-column
+        prop="name"
+        :label="$t('base.user.name')"
+        fit="true"
+      >
         <template slot-scope="scope">
-          <div :title="scope.row.name" class="cell-hidden">
+          <div
+            :title="scope.row.name"
+            class="cell-hidden"
+          >
             {{ scope.row.name }}
           </div>
         </template>
@@ -57,14 +66,24 @@
         fit="true"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.code" class="cell-hidden">
+          <div
+            :title="scope.row.code"
+            class="cell-hidden"
+          >
             {{ scope.row.code }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="deptName" :label="$t('base.dept.name')" fit="true">
+      <el-table-column
+        prop="deptName"
+        :label="$t('base.dept.name')"
+        fit="true"
+      >
         <template slot-scope="scope">
-          <div :title="scope.row.deptName" class="cell-hidden">
+          <div
+            :title="scope.row.deptName"
+            class="cell-hidden"
+          >
             {{ scope.row.deptName }}
           </div>
         </template>
@@ -101,6 +120,10 @@ export default {
     opt: {
       type: Object,
       required: true
+    },
+    treeNode: {
+      type: Object,
+      required: true
     }
   },
   components: {
@@ -114,7 +137,7 @@ export default {
     'el-input': Input,
     'el-button': Button
   },
-  data() {
+  data () {
     return {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
@@ -133,11 +156,11 @@ export default {
   },
   computed: {
     //是否是单人审批，如果不是单人审批则展示多选框
-    notOnlyApprove() {
+    notOnlyApprove () {
       return this.opt.approve.type != 'onlyApprove';
     }
   },
-  created() {
+  created () {
     // this.tableHeight = window.outerHeight > 900 ? 385 : 265;
     this.opt.bpmUsers.forEach(bpmUser => {
       this.receiverIds.push(bpmUser.code);
@@ -146,22 +169,38 @@ export default {
   watch: {
     opt: {
       deep: true,
-      handler: function(newVal, old) {
-        this.empTotal = this.opt.bpmUsers.length;
-        this.sourceAllData = newVal.bpmUsers || [];
-        this.empTableData = this.sourceAllData.slice(
-          this.pageSize * (this.currentPage - 1),
-          this.pageSize * this.currentPage
-        );
-        this.receiverIds = [];
-        this.opt.bpmUsers.forEach(bpmUser => {
-          this.receiverIds.push(bpmUser.code);
-        });
+      handler: function (newVal, old) {
+        if (newVal && newVal.runtime && newVal.runtime.nextNodes && newVal.runtime.nextNodes.length > 0) {
+
+
+          let nextNodeWatch = newVal.runtime.nextNodes[0];
+          this.empTotal = nextNodeWatch.bpmUsers.length;
+          // this.sourceAllData = nextNodeWatch.bpmUsers || [];
+          // this.empTableData = this.sourceAllData.slice(
+          //   this.pageSize * (this.currentPage - 1),
+          //   this.pageSize * this.currentPage
+          // );
+          this.receiverIds = [];
+          nextNodeWatch.bpmUsers.forEach(bpmUser => {
+            var obj = {};
+            obj.name = bpmUser.name;
+            obj.code = bpmUser.code;
+            obj.deptName = bpmUser.deptName;
+            this.empTableData.push(obj);
+            this.receiverIds.push(bpmUser.code);
+          });
+        }
+      }
+    },
+    treeNode: {
+      deep: true,
+      handler (treeNode) {
+        this.treeClickData(treeNode);
       }
     }
   },
   //加载时调用方法 函数
-  mounted() {
+  mounted () {
     let _this = this;
 
     // 初始化选择数据分页
@@ -183,15 +222,53 @@ export default {
       _this.cancelSelecedUser(row);
     });
     //监听保存按钮事件。点击后，清除已选择处理人对象
-    this.EventBus.$on('save-button-click', function() {
+    this.EventBus.$on('save-button-click', function () {
       _this.searchName = '';
       _this.currentPage = 1;
       _this.multipleSelection = [];
     });
   },
   methods: {
+    treeClickData (treeNode) {
+      if (treeNode) {
+        this.treeNode = treeNode;
+      }
+
+      let _this = this;
+      let param = {
+        page: this.currentPage,
+        rows: this.pageSize,
+        deptCode: this.treeNode.code ? this.treeNode.code : this.treeNode.deptCode,
+        search: this.searchName,
+        userNames: this.receiverIds.join(',')
+      };
+      axios['bpm-engine']
+        .post(this.empUrl, param)
+        .then(function (res) {
+          if (res.success) {
+            _this.empTableData = [];
+            res.data.rows.forEach(arr => {
+
+              var obj = {};
+              obj.name = arr.name;
+              obj.code = arr.code;
+              obj.deptName = arr.deptName;
+              _this.empTableData.push(obj);
+            });
+            // _this.empTableData = res.data.rows;
+            _this.empTotal = res.data.total;
+            _this.isShowPagination = true;
+            //必须等列表重新渲染完毕，才能执行此方法。
+
+          }
+          _this.loading = false;
+        })
+        .catch(function (err) {
+          console.log(err);
+        });
+    },
     //每页显示数据个数变化时调用
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       //点击过tree，this.treeNode.code有值进行分页
       if (this.treeNode.code) {
@@ -201,7 +278,7 @@ export default {
         this.resultDataChange();
       }
     },
-    searchGridData() {
+    searchGridData () {
       this.currentPage = 1;
       if (this.treeNode.code) {
         this.requestGridData();
@@ -210,7 +287,7 @@ export default {
       }
     },
     //页码变化时调用
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.currentPage = val;
       if (this.treeNode.code) {
         this.requestGridData();
@@ -219,15 +296,15 @@ export default {
       }
     },
     //判断是否是选择一条数据还是取消选择
-    selectRow(select, row) {
+    selectRow (select, row) {
       return select.some(element => {
         if (element.code == row.code) {
           return true;
         }
       });
     },
-    resultDataChange() {
-      if (this.sourceAllData.length) {
+    resultDataChange () {
+      if (this.sourceAllData) {
         // 按照模糊次进行匹配
         if (this.searchName) {
           const filteredData = this.sourceAllData.filter(item => {
@@ -238,7 +315,7 @@ export default {
           });
           this.empTotal = filteredData.length;
           if (filteredData) {
-            let result = filteredData.slice(
+            var result = filteredData.slice(
               this.pageSize * (this.currentPage - 1),
               this.pageSize * this.currentPage
             );
@@ -247,7 +324,7 @@ export default {
             this.empTableData = [];
           }
         } else {
-          let result = this.sourceAllData.slice(
+          var result = this.sourceAllData.slice(
             this.pageSize * (this.currentPage - 1),
             this.pageSize * this.currentPage
           );
@@ -263,7 +340,7 @@ export default {
         this.empTotal = 0;
       }
     },
-    setRowChecked() {
+    setRowChecked () {
       let _this = this;
       this.empTableData.forEach(row => {
         let index = _this.indexOfMultipleSelection(row);
@@ -273,7 +350,7 @@ export default {
       });
     },
     //判断是否已经选择该条数据
-    indexOfMultipleSelection(row) {
+    indexOfMultipleSelection (row) {
       let index = -1;
       for (let i = 0; i < this.multipleSelection.length; i++) {
         const element = this.multipleSelection[i];
@@ -284,7 +361,7 @@ export default {
       return index;
     },
     //行单击事件只有单人审批是选人才生效，其他审批方式，通过checkbox生效
-    handleRowClick(row, event, column) {
+    handleRowClick (row, event, column) {
       let _this = this;
       let index = this.indexOfMultipleSelection(row);
       if (this.notOnlyApprove) {
@@ -317,7 +394,7 @@ export default {
         dealUserCodes: dealUserCodes.join(',')
       });
     },
-    handleSelect(select, row) {
+    handleSelect (select, row) {
       if (this.selectRow(select, row)) {
         if (this.indexOfMultipleSelection(row) == -1) {
           this.multipleSelection.push(row);
@@ -341,7 +418,7 @@ export default {
         dealUserCodes: dealUserCodes.join(',')
       });
     },
-    handleSelectAll(selection) {
+    handleSelectAll (selection) {
       let _this = this;
       if (selection == 0) {
         this.empTableData.forEach(row => {
@@ -371,7 +448,7 @@ export default {
       });
     },
     //请求数据
-    requestGridData() {
+    requestGridData () {
       let _this = this;
       let param = {
         page: this.currentPage,
@@ -382,23 +459,22 @@ export default {
       };
       axios['bpm-engine']
         .post(this.empUrl, param)
-        .then(function(res) {
+        .then(function (res) {
           if (res.success) {
             _this.empTableData = res.data.rows;
             _this.empTotal = res.data.total;
             //必须等列表重新渲染完毕，才能执行此方法。
-            setTimeout(function() {
+            setTimeout(function () {
               _this.setRowStatus();
             }, 100);
           }
           _this.loading = false;
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
     },
-
-    setRowStatus() {
+    setRowStatus () {
       let _this = this;
       this.empTableData.forEach(row => {
         let index = _this.indexOfMultipleSelection(row);
@@ -407,7 +483,7 @@ export default {
         }
       });
     },
-    cancelSelecedUser(row) {
+    cancelSelecedUser (row) {
       let index = this.indexOfMultipleSelection(row);
       if (index != -1) {
         this.multipleSelection.splice(index, 1);
@@ -426,7 +502,7 @@ export default {
         dealUserCodes: dealUserCodes.join(',')
       });
     },
-    getRow(code) {
+    getRow (code) {
       let row = null;
       for (let i = 0; i < this.empTableData.length; i++) {
         const element = this.empTableData[i];
@@ -459,7 +535,7 @@ export default {
 .table-tools-btn {
   float: left;
   margin-top: 5px;
-  // padding-right: 40px;
+  padding-right: 40px;
   padding-left: 2px;
 }
 .el-icon-search-button {

package/packages/bpm-user-select-dialog/Tree.vue

@@ -1,20 +1,76 @@
 <template>
-  <el-tree
-    :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>
+  <div style="height:100%;width:100%">
+    <el-row>
+      <el-col
+        :span="24"
+        style="padding: 4px;"
+      >
+        <el-input
+          placeholder="请输入名称或编码"
+          v-model="searchName"
+          clearable
+          @change="searchTree"
+          @keyup.enter.native="searchTree"
+          suffix-icon="el-icon-search"
+        ></el-input>
+      </el-col>
+    </el-row>
+    <el-row style="overflow-y: auto;height:91%">
+      <div>
+        <el-tree
+          :data="treeNode"
+          class="flow-tree"
+          ref="tree"
+          v-show="isShow"
+          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>
 <script>
 import { Tree, Container } from 'element-ui';
@@ -25,17 +81,22 @@ export default {
     'el-container': Container
   },
   //初始化数据下
-  data() {
+  data () {
     return {
-      height: 0,
-      orgUrl: '/api/identity/bpm-dept/tree-by-deptcodes', //组织机构树接口
       treeNode: [],
+      treeData: [],
+      defaultExpandedKeys: [],
+      treeNodeSearch: [],
+      searchName: '',
+      orgUrl: '/api/identity/bpm-dept/tree-by-deptcodes', //组织机构树接口
+      orgListUrl: "/api/identity/bpm-dept/tree-by-search", //组织机构列表筛选接口
+      isShow: true,
+      id: "-1",
       treeProps: {
         children: 'children',
         label: 'name',
         id: 'id'
       },
-      defaultExpandedKeys: []
     };
   },
   props: {
@@ -44,53 +105,82 @@ export default {
       required: false
     }
   },
+  watch: {
+    opt: {
+      deep: true,
+      handler (opt) {
+        let _this = this;
+        let deptCodes = [];
+        opt.bpmUsers.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;
+            console.log(_this.treeNode);
+            _this.defaultExpandedKeys.push(res.data[0].id);
+            _this.$emit('refreshGrid', res.data[0]);
+          })
+          .catch(function (err) {
+            console.log(err);
+          });
+      },
+      immediate: true
+    },
+    treeNode: {
+      deep: true,
+      handler (treeNode) {
+        console.log("333" + treeNode);
+      }
+    }
+  },
   //方法
   methods: {
     //树节点点击事件
-    handelrNodeClick(treeNode) {
-      this.EventBus.$emit('refresh-source-grid' + this.opt.taskDeKey, treeNode);
-    }
-  },
-  //页面渲染之前调用方法 函数
-  created() {},
-  mounted() {
-    let _this = this;
-    let deptCodes = [];
-    this.opt.bpmUsers.forEach(bpmUser => {
-      if (bpmUser.deptCode && !deptCodes.includes(bpmUser.deptCode)) {
-        deptCodes.push(bpmUser.deptCode);
+    handelrNodeClick (treeNode) {
+      this.$emit('refreshGrid', treeNode);
+    },
+    searchTree () {
+      let _this = this;
+      if (_this.searchName == null || _this.searchName == '') {
+        _this.treeNodeSearch = [];
+        _this.isShow = true;
+        _this.$emit('refreshGrid', this.treeNode[0]);
+        return
       }
-    });
-    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);
+
+      let deptCodes = [];
+      this.opt.bpmUsers.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,
+          deptCodes: deptCodes.join(',')
+        })
+        .then(function (res) {
+          _this.treeNodeSearch = res.data;
+          _this.$nextTick(() => {
+            _this.$refs.treeSearch.setCurrentKey(res.data[0].id);
+          });
+          _this.handelrNodeClick(res.data[0]);
+
+        })
+        .catch(function (err) {
+          console.log(err);
+        });
+    },
   },
-  //页面渲染完成调用方法 函数
-  watch: {
-    // opt(old, newVal) {
-    //   let _this = this;
-    //   let deptCodes = [];
-    //   this.opt.bpmUsers.forEach(bpmUser => {
-    //     if (bpmUser.deptCodes && !deptCodes.includes(bpmUser.deptCodes)) {
-    //       deptCodes.push(bpmUser.deptCodes);
-    //     }
-    //   });
-    //   axios['bpm-engine']
-    //     .post(this.orgUrl, { deptCodes: deptCodes.join(',') })
-    //     .then(function(res) {
-    //       _this.treeNode = res.data;
-    //     })
-    //     .catch(function(err) {
-    //       console.log(err);
-    //     });
-    // }
-  }
+  //页面渲染之前调用方法 函数
+  created () { },
+  mounted () { },
 };
 </script>
 <style></style>

package/packages/bpm-user-select-dialog/bpm-next-node.vue

@@ -3,10 +3,16 @@
     <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;background-color: #e8ecf3">
       <el-container>
         <el-aside style="height:456px;width: 40%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
-          <v-tree :opt="nextNode" />
+          <v-tree
+            :opt="nextNode"
+            @refreshGrid="treeClickData"
+          />
         </el-aside>
         <el-main style="height:456px;width:45%;padding: 0px;margin-left:2px">
-          <v-source-grid :opt="nextNode" />
+          <v-source-grid
+            :opt="nextNode"
+            :treeNode="treeNode"
+          />
         </el-main>
       </el-container>
     </el-aside>
@@ -37,15 +43,21 @@ export default {
     'el-main': Main,
     'el-container': Container
   },
-  data() {
+  data () {
     return {
       opt: {
         maxHeight: '483px'
-      }
+      },
+      treeNode: {},
     };
   },
-  created() {
+  created () {
     this.maxHeight = window.outerHeight > 900 ? '483px' : '361px';
+  },
+  methods: {
+    treeClickData (treeNode) {
+      this.treeNode = treeNode;
+    }
   }
 };
 </script>

package/packages/i18n/langs/zh_CN.js

@@ -48,9 +48,9 @@ var base_zh = {
       please_select: '请选择',
       for_personnel: '待选列表',
       selected_personnel_list: '已选列表',
-      name: '姓名',
-      coding: '编码',
-      department: '部门',
+      name: '人员姓名',
+      coding: '人员编码',
+      department: '部门名称',
       please_personnel: '请选择人员'
     },
     back_anyLink: {
@@ -60,9 +60,9 @@ var base_zh = {
       please_select: '请选择',
       for_personnel: '待选列表',
       selected_personnel_list: '已选列表',
-      name: '姓名',
-      coding: '编码',
-      department: '部门',
+      name: '人员姓名',
+      coding: '人员编码',
+      department: '部门名称',
       please_personnel: '请选择人员'
     },
     jump_latest: {