cloud-module-bpm 6.13.2 → 6.13.3

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

@@ -19,8 +19,14 @@
       >
         <el-row>
           <el-form-item :label="$t('bpm.opinion.opinion_area')">
-            <el-tabs v-model="activeOpinionArea" class="cloud-opinion-area">
-              <el-tab-pane :label="$t('bpm.opinion.common_opinion')">
+            <el-tabs
+              v-model="activeOpinionArea"
+              class="cloud-opinion-area"
+            >
+              <el-tab-pane
+                v-if="!customOpinions.length>0"
+                :label="$t('bpm.opinion.common_opinion')"
+              >
                 <el-row class="cloud-opinion-area-tab-pane">
                   <el-row
                     v-for="commonOpinion in commonOpinions"
@@ -37,7 +43,10 @@
                   </el-row>
                 </el-row>
               </el-tab-pane>
-              <el-tab-pane :label="$t('bpm.opinion.personal_opinion')">
+              <el-tab-pane
+                v-if="!customOpinions.length>0"
+                :label="$t('bpm.opinion.personal_opinion')"
+              >
                 <el-row class="cloud-opinion-area-tab-pane">
                   <el-row
                     v-for="personalOpinion in personalOpinions"
@@ -54,6 +63,24 @@
                   </el-row>
                 </el-row>
               </el-tab-pane>
+              <el-row
+                v-else
+                class="cloud-opinion-area-tab-pane"
+              >
+                <el-row
+                  v-for="customOpinion in customOpinions"
+                  :key="customOpinion"
+                >
+                  <el-col>
+                    <div
+                      class="cloud-opinion-area-item"
+                      @click="handleOpnionSelect(customOpinion)"
+                    >
+                      {{ customOpinion }}
+                    </div>
+                  </el-col>
+                </el-row>
+              </el-row>
             </el-tabs>
           </el-form-item>
         </el-row>
@@ -76,12 +103,21 @@
         </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 @click="handleSave" v-if="isZc">暂存</el-button>
-        <el-button type="primary" @click="handlePublish">确定</el-button>
+          }}</el-button>
+        <el-button
+          @click="handleSave"
+          v-if="isZc"
+        >暂存</el-button>
+        <el-button
+          type="primary"
+          @click="handlePublish"
+        >确定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -129,7 +165,7 @@ export default {
       required: true
     }
   },
-  data() {
+  data () {
     return {
       maxHeight: '',
       isZc: false,
@@ -151,19 +187,21 @@ export default {
         content: undefined
       },
       commonOpinions: [],
-      personalOpinions: []
+      personalOpinions: [],
+      customOpinions: []
     };
   },
-  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;
+      let opinionType = _this.ruleEngine.opinion.opinionType;
       if (_this.ruleEngine.opinion && _this.ruleEngine.opinion.zc == '1') {
         _this.isZc = true;
       }
@@ -174,31 +212,54 @@ export default {
           taskId: taskId,
           taskDefKey: taskDefKey
         })
-        .then(function(res) {
+        .then(function (res) {
           _this.procOpinion.content = res.data;
         })
-        .catch(function(err) {
+        .catch(function (err) {
           console.log(err);
         });
       //在此处查询公共意见和个人意见
-      axios['bpm-engine']
-        .post('/bpm/api/opinion/getAllOpionContent', {})
-        .then(function(res) {
-          //公共意见
-          if (res.data.commonOpinions.length > 0) {
-            _this.commonOpinions = res.data.commonOpinions;
-          }
-          //个人意见
-          if (res.data.personalOpinions.length > 0) {
-            _this.personalOpinions = res.data.personalOpinions;
-          }
-        })
-        .catch(function(err) {
-          console.log(err);
-        });
+      if (opinionType == '2') {
+        axios['bpm-engine']
+          .post('/bpm/api/opinion/getCustomAllOpionContent', { activityId: taskDefKey })
+          .then(function (res) {
+            //自定义意见
+            if (res.data.customOpinions && res.data.customOpinions.length > 0) {
+              _this.customOpinions = res.data.customOpinions;
+            }
+            //公共意见
+            if (res.data.commonOpinions && res.data.commonOpinions.length > 0) {
+              _this.commonOpinions = res.data.commonOpinions;
+            }
+            //个人意见
+            if (res.data.personalOpinions && res.data.personalOpinions.length > 0) {
+              _this.personalOpinions = res.data.personalOpinions;
+            }
+          })
+          .catch(function (err) {
+            console.log(err);
+          });
+      } else {
+        axios['bpm-engine']
+          .post('/bpm/api/opinion/getAllOpionContent', {})
+          .then(function (res) {
+            //公共意见
+            if (res.data.commonOpinions.length > 0) {
+              _this.commonOpinions = res.data.commonOpinions;
+            }
+            //个人意见
+            if (res.data.personalOpinions.length > 0) {
+              _this.personalOpinions = res.data.personalOpinions;
+            }
+          })
+          .catch(function (err) {
+            console.log(err);
+          });
+      }
+
     },
     //流程意见选择事件
-    handleOpnionSelect(opinion) {
+    handleOpnionSelect (opinion) {
       if (
         this.procOpinion.content == null ||
         this.procOpinion.content.length == 0
@@ -212,12 +273,12 @@ export default {
       }
     },
     //关闭人员选择对话框
-    handleClose() {
+    handleClose () {
       this.procOpinion.content = undefined;
       this.$refs.procOpinion.resetFields();
       this.$emit('dialog-close', this.dialogVisible);
     },
-    handleSave() {
+    handleSave () {
       let _this = this;
       if (_this.procOpinion.content.length > 200) {
         return this.$message.error(
@@ -239,24 +300,24 @@ export default {
               content: _this.procOpinion.content,
               type: 'save'
             })
-            .then(function(res) {
+            .then(function (res) {
               _this.$emit("dialog-save", _this.ruleEngine);
               _this.$emit("dialog-close");
               let ele = document.getElementsByClassName('a-SXYJ');
-              if(ele && ele.length > 0){
+              if (ele && ele.length > 0) {
                 _this.refreshCurrentPageOpionList();
-              } else{
+              } else {
                 // 不存在
-                _this.$emit('refreshCurrentPageOpionList',_this.ruleEngine);
+                _this.$emit('refreshCurrentPageOpionList', _this.ruleEngine);
               }
             })
-            .catch(function(err) {
+            .catch(function (err) {
               console.log(err);
             });
         }
       });
     },
-    handlePublish() {
+    handlePublish () {
       let _this = this;
       if (_this.procOpinion.content.length > 255) {
         return this.$message.error(
@@ -278,26 +339,26 @@ export default {
               content: _this.procOpinion.content,
               type: 'publish'
             })
-            .then(function(res) {
+            .then(function (res) {
               _this.$emit("dialog-save", _this.ruleEngine);
               _this.$emit("dialog-close");
               let ele = document.getElementsByClassName('a-SXYJ');
               console.log('ele:' + ele);
-              if(ele && ele.length > 0){
+              if (ele && ele.length > 0) {
                 _this.refreshCurrentPageOpionList();
-              } else{
+              } else {
                 // 不存在
-                _this.$emit('refreshCurrentPageOpionList',_this.ruleEngine);
+                _this.$emit('refreshCurrentPageOpionList', _this.ruleEngine);
               }
-              
+
             })
-            .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-send-read-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">

package/packages/bpm-send-read-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"
+          @change="requestGridData"
         >
-          <!-- <el-button
+          <el-button
             class="el-icon-search-button"
             slot="append"
             icon="el-icon-search"
-            @click="searchGridData"
-          ></el-button> -->
+            @click="requestGridData"
+          ></el-button>
         </el-input>
       </el-col>
     </el-row>
@@ -39,10 +41,20 @@
       @row-click="handleRowClick"
     >
       <div class=""></div>
-      <el-table-column style="height: 18px" type="selection"></el-table-column>
-      <el-table-column prop="name" :label="$t('base.user.name')" fit="true">
+      <el-table-column
+        style="height: 18px"
+        type="selection"
+      ></el-table-column>
+      <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>
@@ -53,14 +65,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>
@@ -110,7 +132,7 @@ export default {
     'el-input': Input,
     'el-button': Button
   },
-  data() {
+  data () {
     return {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
@@ -128,14 +150,14 @@ export default {
     };
   },
   computed: {},
-  created() {
+  created () {
     // this.tableHeight = window.outerHeight > 900 ? 385 : 265;
     this.opt.forEach(bpmUser => {
       this.receiverIds.push(bpmUser.code);
     });
   },
   watch: {
-    opt(old, newVal) {
+    opt (old, newVal) {
       this.empTableData = this.opt;
       this.empTotal = this.opt.length;
       this.opt.forEach(bpmUser => {
@@ -144,18 +166,18 @@ export default {
     }
   },
   //加载时调用方法 函数
-  mounted() {
+  mounted () {
     let _this = this;
     // this.empTableData = this.opt;
     // this.empTableData = this.opt.bpmUsers;
     // 初始化选择数据分页
     this.sourceAllData = this.opt;
-    if (!this.treeNode.code) {
+    if (!this.treeNode.code && !this.treeNode.deptCode) {
       this.resultDataChange();
     }
     this.empTotal = this.opt.length;
     //点击树节点，刷新待选列表
-    this.EventBus.$on('refresh-source-grid', treeNode => {
+    this.EventBus.$on('refresh-source-grid-sendRead', treeNode => {
       _this.pageSize = 10;
       _this.currentPage = 1;
       _this.treeNode = treeNode.attributes || treeNode;
@@ -166,17 +188,17 @@ export default {
       _this.cancelSelecedUser(row);
     });
     //监听保存按钮事件。点击后，清除已选择处理人对象
-    this.EventBus.$on('save-button-click', function() {
+    this.EventBus.$on('save-button-click', function () {
       _this.searchName = '';
       _this.multipleSelection = [];
     });
   },
   methods: {
     //每页显示数据个数变化时调用
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       //点击过tree，this.treeNode.code有值进行分页
-      if (this.treeNode.code) {
+      if (this.treeNode.code || this.treeNode.deptCode) {
         this.requestGridData();
       } else {
         //未点击tree进行分页
@@ -184,71 +206,37 @@ export default {
       }
     },
     //页码变化时调用
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.currentPage = val;
       //点击过tree，this.treeNode.code有值进行分页
-      if (this.treeNode.code) {
+      if (this.treeNode.code || this.treeNode.deptCode) {
         this.requestGridData();
       } else {
         //未点击tree进行分页
         this.resultDataChange();
       }
     },
-    searchGridData() {
-      this.currentPage = 1;
-      if (this.treeNode.code) {
-        this.requestGridData();
-      } else {
-        this.resultDataChange();
-      }
-    },
     //判断是否是选择一条数据还是取消选择
-    selectRow(select, row) {
+    selectRow (select, row) {
       return select.some(element => {
         if (element.code == row.code) {
           return true;
         }
       });
     },
-    resultDataChange() {
-      if (this.sourceAllData.length) {
-        // 按照模糊次进行匹配
-        if (this.searchName) {
-          const filteredData = this.sourceAllData.filter(item => {
-            const code = String(item.code || '').toLowerCase();
-            const name = String(item.name || '').toLowerCase();
-            const keywordLower = this.searchName.toLowerCase();
-            return code.includes(keywordLower) || name.includes(keywordLower);
-          });
-          this.empTotal = filteredData.length;
-          if (filteredData) {
-            let result = filteredData.slice(
-              this.pageSize * (this.currentPage - 1),
-              this.pageSize * this.currentPage
-            );
-            this.empTableData = result;
-          } else {
-            this.empTableData = [];
-          }
-        } else {
-          let result = this.sourceAllData.slice(
-            this.pageSize * (this.currentPage - 1),
-            this.pageSize * this.currentPage
-          );
-          this.empTableData = result;
-          this.empTotal = this.sourceAllData.length;
-        }
-        // 设置行选中效果
-        this.$nextTick(() => {
-          this.setRowStatus();
-        });
+    resultDataChange () {
+      if (this.sourceAllData) {
+        var result = this.sourceAllData.slice(
+          this.pageSize * (this.currentPage - 1),
+          this.pageSize * this.currentPage
+        );
+        this.empTableData = result;
       } else {
         this.empTableData = [];
-        this.empTotal = 0;
       }
     },
     //判断是否已经选择该条数据
-    indexOfMultipleSelection(row) {
+    indexOfMultipleSelection (row) {
       var index = -1;
       var _this = this;
       if (_this.multipleSelection.length > 0) {
@@ -262,7 +250,7 @@ export default {
       return index;
     },
     //行单击事件只有单人审批是选人才生效，其他审批方式，通过checkbox生效
-    handleRowClick(row, event, column) {
+    handleRowClick (row, event, column) {
       let _this = this;
       let index = this.indexOfMultipleSelection(row);
       this.$refs.sourceGrid.toggleRowSelection(row);
@@ -280,7 +268,7 @@ export default {
         dealUserCodes: dealUserCodes
       });
     },
-    handleSelect(select, row) {
+    handleSelect (select, row) {
       if (this.selectRow(select, row)) {
         if (this.indexOfMultipleSelection(row) == -1) {
           this.multipleSelection.push(row);
@@ -300,7 +288,7 @@ export default {
         dealUserCodes: dealUserCodes
       });
     },
-    handleSelectAll(selection) {
+    handleSelectAll (selection) {
       if (selection.length == 0) {
         this.empTableData.forEach(row => {
           let index = this.indexOfMultipleSelection(row);
@@ -320,39 +308,39 @@ export default {
       this.multipleSelection.forEach(element => {
         dealUserCodes[element.code] = element.name;
       });
-      this.EventBus.$emit('refresh-selected-grid' ,this.multipleSelection);
+      this.EventBus.$emit('refresh-selected-grid', this.multipleSelection);
       this.EventBus.$emit('update-selected-user', {
         dealUserCodes: dealUserCodes
       });
     },
     //请求数据
-    requestGridData() {
+    requestGridData () {
       let _this = this;
       let param = {
         page: this.currentPage,
         rows: this.pageSize,
-        deptCode: this.treeNode.code,
+        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) {
+        .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);
@@ -361,29 +349,29 @@ export default {
         }
       });
     },
-    cancelSelecedUser(row) {
-        //取消已选中的
-        let index = this.indexOfMultipleSelection(row);
-        if (index != -1) {
-          this.multipleSelection.splice(index, 1);
-        }
-        //更新待选的人员
-        for (var i = 0; i < this.empTableData.length; i++) {
-          if (this.empTableData[i].code == row.code) {
-            this.$refs.sourceGrid.toggleRowSelection(
-              this.empTableData[i],
-              false
-            );
-          }
+    cancelSelecedUser (row) {
+      //取消已选中的
+      let index = this.indexOfMultipleSelection(row);
+      if (index != -1) {
+        this.multipleSelection.splice(index, 1);
+      }
+      //更新待选的人员
+      for (var i = 0; i < this.empTableData.length; i++) {
+        if (this.empTableData[i].code == row.code) {
+          this.$refs.sourceGrid.toggleRowSelection(
+            this.empTableData[i],
+            false
+          );
         }
-        // this.$refs.sourceGrid.toggleRowSelection(row);
-        let dealUserCodes = {};
-        this.multipleSelection.forEach(element => {
-          dealUserCodes[element.code] = element.name;
-        });
-        this.EventBus.$emit('update-selected-user', {
-          dealUserCodes: dealUserCodes
-        });
+      }
+      // this.$refs.sourceGrid.toggleRowSelection(row);
+      let dealUserCodes = {};
+      this.multipleSelection.forEach(element => {
+        dealUserCodes[element.code] = element.name;
+      });
+      this.EventBus.$emit('update-selected-user', {
+        dealUserCodes: dealUserCodes
+      });
     }
   }
 };