cloud-module-bpm 6.13.2 → 6.13.3

package/packages/bpm-send-read-dialog/Tree.vue

@@ -1,20 +1,78 @@
 <template>
-  <el-tree
-    :data="treeNode"
-    class="flow-tree"
-    ref="tree"
-    node-key="id"
-    :props="treeProps"
-    @node-click="handelrNodeClick"
-    highlight-current
-    :default-expanded-keys="['1']"
-  >
-    <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
+          @clear="restart"
+          @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,10 +83,15 @@ export default {
     'el-container': Container
   },
   //初始化数据下
-  data() {
+  data () {
     return {
       orgUrl: '/api/identity/bpm-dept/tree-by-deptcodes', //组织机构树接口
+      orgListUrl: "/api/identity/bpm-dept/tree-by-search", //组织机构列表筛选接口
       treeNode: [],
+      isShow: true,
+      treeNodeSearch: [],
+      searchName: '',
+      defaultExpandedKeys: [],
       treeProps: {
         children: 'children',
         label: 'name',
@@ -45,14 +108,70 @@ export default {
   //方法
   methods: {
     //树节点点击事件
-    handelrNodeClick(treeNode) {
-      this.EventBus.$emit('refresh-source-grid', treeNode);
-    }
+    handelrNodeClick (treeNode) {
+      this.EventBus.$emit('refresh-source-grid-sendRead', treeNode);
+    },
+    searchTree () {
+      let _this = this;
+      if (_this.searchName == null || _this.searchName == '') {
+        _this.treeNodeSearch = [];
+        _this.isShow = true;
+        return;
+      }
+
+      let deptCodes = [];
+      _this.opt.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) {
+
+          if (res.data.length > 0) {
+            _this.treeNodeSearch = res.data;
+            _this.$nextTick(() => {
+              _this.$refs.treeSearch.setCurrentKey(res.data[0].id);
+            });
+            _this.handelrNodeClick(res.data[0]);
+          } else {
+            _this.treeNodeSearch = [];
+          }
+        })
+        .catch(function (err) {
+          console.log(err);
+        });
+    },
+    restart () {
+      this.treeNodeSearch = [];
+      this.isShow = true;
+      let _this = this;
+      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);
+        });
+    },
 
   },
   //页面渲染之前调用方法 函数
-  created() {},
-  mounted() {
+  created () { },
+  mounted () {
     let _this = this;
     let deptCodes = [];
     this.opt.forEach(bpmUser => {
@@ -62,10 +181,12 @@ export default {
     });
     axios['bpm-engine']
       .post(this.orgUrl, { deptCodes: deptCodes.join(',') })
-      .then(function(res) {
+      .then(function (res) {
         _this.treeNode = res.data;
+        _this.defaultExpandedKeys.push(res.data[0].id);
+        _this.EventBus.$emit('refresh-source-grid-sendRead', res.data[0]);
       })
-      .catch(function(err) {
+      .catch(function (err) {
         console.log(err);
       });
   }

package/packages/bpm-send-read-dialog/bpm-next-node.vue

@@ -2,7 +2,7 @@
   <el-container>
     <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">
@@ -37,14 +37,14 @@ export default {
     'el-main': Main,
     'el-container': Container
   },
-  data() {
+  data () {
     return {
       opt: {
         maxHeight: '483px'
       }
     };
   },
-  created() {
+  created () {
     this.maxHeight = window.outerHeight > 900 ? '483px' : '361px';
   }
 };

package/packages/bpm-send-read-opinion-dialog/bpm-send-read-opinion.vue

@@ -17,9 +17,12 @@
         label-width="80px"
         label-position="right"
       >
-        <el-row>
+        <el-row v-if='!viewFlag'>
           <el-form-item :label="$t('bpm.send_read_opinion.opinion_area')">
-            <el-tabs v-model="activeOpinionArea" class="cloud-opinion-area">
+            <el-tabs
+              v-model="activeOpinionArea"
+              class="cloud-opinion-area"
+            >
               <el-tab-pane :label="$t('bpm.send_read_opinion.common_opinion')">
                 <el-row class="cloud-opinion-area-tab-pane">
                   <el-row
@@ -37,9 +40,7 @@
                   </el-row>
                 </el-row>
               </el-tab-pane>
-              <el-tab-pane
-                :label="$t('bpm.send_read_opinion.personal_opinion')"
-              >
+              <el-tab-pane :label="$t('bpm.send_read_opinion.personal_opinion')">
                 <el-row class="cloud-opinion-area-tab-pane">
                   <el-row
                     v-for="personalOpinion in personalOpinions"
@@ -78,13 +79,19 @@
         </el-row>
       </el-form>
 
-      <span slot="footer" class="dialog-footer">
+      <span
+        slot="footer"
+        class="dialog-footer"
+      >
         <el-button @click="handleClose">{{
           $t('base.button.cancel')
-        }}</el-button>
-        <el-button type="primary" @click="handleSave">{{
+          }}</el-button>
+        <el-button
+          type="primary"
+          @click="handleSave"
+        >{{
           $t('base.button.ok')
-        }}</el-button>
+          }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -132,7 +139,7 @@ export default {
       required: true
     }
   },
-  data() {
+  data () {
     return {
       maxHeight: '',
       rules: {
@@ -153,37 +160,31 @@ export default {
         content: undefined
       },
       commonOpinions: [],
-      personalOpinions: []
+      personalOpinions: [],
+      viewFlag: false,
     };
   },
-  created() {
+  created () {
     this.maxHeight = window.outerHeight > 900 ? '483px' : '361px';
   },
   methods: {
-    openDialog() {
+    openDialog () {
       let _this = this;
-      let procDefId = _this.ruleEngine.runtime.procDefId;
-      let procInstId = _this.ruleEngine.runtime.procInstId;
-      let taskId = _this.ruleEngine.runtime.taskId;
-      let taskDefKey = _this.ruleEngine.runtime.taskDefKey;
-
       axios['bpm-engine']
-        .post('/api/engine/procopinion/getContent/nopublish', {
-          procDefId: procDefId,
-          procInstId: procInstId,
-          taskId: taskId,
-          taskDefKey: taskDefKey
-        })
-        .then(function(res) {
+        .post('/api/engine/procopinion/getContent/getSendReadCustomOpinion', {})
+        .then(function (res) {
           _this.procOpinion.content = res.data;
+          if (_this.procOpinion.content) {
+            _this.viewFlag = true;
+          }
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
       //在此处查询公共意见和个人意见
       axios['bpm-engine']
         .post('/bpm/api/opinion/getAllOpionContent', {})
-        .then(function(res) {
+        .then(function (res) {
           //公共意见
           if (res.data.commonOpinions.length > 0) {
             _this.commonOpinions = res.data.commonOpinions;
@@ -193,12 +194,12 @@ export default {
             _this.personalOpinions = res.data.personalOpinions;
           }
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
     },
     //流程意见选择事件
-    handleOpnionSelect(opinion) {
+    handleOpnionSelect (opinion) {
       if (
         this.procOpinion.content == null ||
         this.procOpinion.content.length == 0
@@ -212,11 +213,11 @@ export default {
       }
     },
     //关闭对话框
-    handleClose() {
+    handleClose () {
       this.procOpinion.content = undefined;
       this.$emit('dialog-close', this.dialogVisible);
     },
-    handleSave() {
+    handleSave () {
       let _this = this;
       if (_this.procOpinion.content.length > 255) {
         return this.$message.error(
@@ -238,17 +239,17 @@ export default {
               content: _this.procOpinion.content,
               type: 'publish'
             })
-            .then(function(res) {
+            .then(function (res) {
               _this.$emit('dialog-save', _this.ruleEngine);
               _this.refreshCurrentPageOpionList();
             })
-            .catch(function(err) {
+            .catch(function (err) {
               console.log(err);
             });
         }
       });
     },
-    refreshCurrentPageOpionList() {
+    refreshCurrentPageOpionList () {
       // 刷新当前页面的意见列表 给AMIS定制刷新页面的意见列表组件
       let sxBtn = document.getElementsByClassName('a-SXYJ');
       if (sxBtn && sxBtn[0]) {

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

@@ -21,7 +21,7 @@
       </el-table-column>
       <el-table-column
         prop="code"
-        :label="$t('base.user.user_name')"
+        :label="$t('bpm.user_select.emp_code')"
         fit="true"
       >
         <template slot-scope="scope">
@@ -58,7 +58,7 @@ export default {
   },
   data() {
     return {
-      tableHeight: 400,
+      tableHeight: 426,
       tableData: [],
       currentPage: 1,
       pagesize: 10,