cloud-module-bpm 6.3.0 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
@@ -16,7 +16,7 @@
     "axios": "0.19.0",
     "babel-loader": "^8.0.6",
     "babel-polyfill": "^6.26.0",
-    "cloud-module-base": "6.3.0",
+    "cloud-module-base": "6.4.0",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
     "element-ui": "^2.13.2",
@@ -63,4 +63,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}

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

@@ -3,7 +3,7 @@
     <el-dialog
       :title="opt.title"
       :visible.sync="dialogVisible"
-      width="650px"
+      width="700px"
       top="8vh"
       @open="openDialog"
       :before-close="handleClose"
@@ -14,22 +14,30 @@
       <el-form>
         <div style="padding: 10px 0px 30px 0px">
           <el-row>
-            <el-col :span="8" style="padding-right:140px">
+            <el-col :span="8" style="text-align: left">
               {{ $t('bpm.jump.choice_activity') }}
             </el-col>
-          </el-row>
-          <el-row type="flex" justify="center">
-            <span style="padding-right:5px;line-height:2.5;">
+            <el-col :span="16">
+             <span style="padding-right:5px;line-height:2.5;">
               {{ $t('bpm.jump.activity_name') }}
             </span>
-            <el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-            </el-select>
+              <el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+              </el-select>
+            </el-col>
           </el-row>
+          <!--<el-row type="flex" justify="center">-->
+            <!--<span style="padding-right:5px;line-height:2.5;">-->
+              <!--{{ $t('bpm.jump.activity_name') }}-->
+            <!--</span>-->
+            <!--<el-select style="width:200px" @change="handleChange" v-model="value" :placeholder="$t('bpm.jump.please_select')">-->
+              <!--<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>-->
+            <!--</el-select>-->
+          <!--</el-row>-->
         </div>
         <div>
-          <el-row>
-            <el-col :span="8" style="padding-right:140px">{{ $t('bpm.jump.for_personnel') }}</el-col>
+          <el-row style="text-align: left">
+            <el-col :span="8">{{ $t('bpm.jump.for_personnel') }}</el-col>
           </el-row>
           <el-table
             :data="initialTableData"
@@ -53,8 +61,8 @@
           </el-table>
         </div>
         <div style="padding: 20px 0px 0px 0px">
-          <el-row>
-            <el-col :span="8" style="padding-right:140px">{{ $t('bpm.jump.selected_personnel_list') }}</el-col>
+          <el-row style="text-align: left">
+            <el-col :span="8">{{ $t('bpm.jump.selected_personnel_list') }}</el-col>
           </el-row>
           <el-table :data="selectTableData" tooltip-effect="dark" stripe height="150" @row-click="handleRowClick">
             <el-table-column width="55"></el-table-column>
@@ -70,7 +78,6 @@
           </el-table>
         </div>
       </el-form>
-
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">{{ $t('base.button.cancel') }}</el-button>
         <el-button type="primary" @click="handleSave">{{ $t('base.button.ok') }}</el-button>

package/packages/bpm-jump-latest-dialog/bpm-jump-latest-dialog.vue

@@ -12,7 +12,7 @@
       class="jumpDialog"
     >
       <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: 35%;max-width: 400px;padding-top:5px;margin:0px;border-radius: 0px;">
               <v-tree />
@@ -21,7 +21,7 @@
             <el-main style="height:456px; width: 45%; padding: 0px; margin-left: 2px;">
               <div class="selected-grid">
                 <el-row>
-                  <el-col style="padding:7px;padding-right:290px;">
+                  <el-col style="text-align: left;padding: 7px 7px 0 7px">
                     {{ $t('bpm.jump.choice_activity') }}
                   </el-col>
                 </el-row>
@@ -34,7 +34,7 @@
                   </el-col>
                 </el-row>
                 <el-row>
-                  <el-col style="padding:7px;padding-right:290px;">{{ $t('bpm.jump.for_personnel') }}</el-col>
+                  <el-col style="text-align: left;padding: 7px 7px 0 7px">{{ $t('bpm.jump.for_personnel') }}</el-col>
                 </el-row>
                 <el-table
                   :data="initialTableData"
@@ -100,7 +100,7 @@
             <el-row style="float:left;padding:7px;">
               {{ $t('bpm.jump.selected_personnel_list') }}
             </el-row>
-            <el-table :data="selectTableData" :height="tableHeight + 111" @row-click="handleRowClick">
+            <el-table :data="selectTableData" :height="tableHeight + 85" @row-click="handleRowClick">
               <el-table-column prop="name" :label="$t('bpm.jump.name')"> 
                 <template slot-scope="scope">
                       <div :title="scope.row.name" class="cell-hidden">
@@ -172,7 +172,7 @@ export default {
       pageSize: 10,
       pagerCount: 5,
       total: 10,
-      tableHeight: 315,
+      tableHeight: 300,
       maxHeight: '483px',
       //默认参数
       opt: {

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

@@ -58,7 +58,7 @@ export default {
   },
   data() {
     return {
-      tableHeight: 426,
+      tableHeight: 400,
       tableData: [],
       currentPage: 1,
       pagesize: 10,

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

@@ -112,7 +112,7 @@ export default {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
       multipleSelection: [],
-      tableHeight: 375,
+      tableHeight: 355,
       currentPage: 1,
       pageSize: 10,
       pagerCount: 5,

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

@@ -1,6 +1,6 @@
 <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;">
           <v-tree :opt="nextNode" />

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

@@ -66,7 +66,7 @@ export default {
   },
   data() {
     return {
-      tableHeight: 375,
+      tableHeight: 355,
       tableData: [],
       currentPage: 1,
       pagesize: 10,

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

@@ -116,7 +116,7 @@ export default {
       empUrl: '/api/identity/bpm-user/list-by-deptcode', //人员数据接口
       searchName: '',
       multipleSelection: [],
-      tableHeight: 375,
+      tableHeight: 355,
       currentPage: 1,
       pageSize: 10,
       pagerCount: 5,

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

@@ -1,6 +1,6 @@
 <template>
-  <el-container>
-    <el-aside style="height:456px;width:65%;margin-right: 0px;margin-left: 0px;">
+  <el-container style="background: #e8ecf3">
+    <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" />

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

@@ -11,7 +11,7 @@
       :close-on-click-modal="false"
       append-to-body
     >
-      <el-tabs v-model="activeNodeName">
+      <el-tabs v-model="activeNodeName" style="padding: 0 20px 20px 20px!important">
         <el-tab-pane v-for="nextNode in nextNodes" :label="nextNode.taskName" :name="nextNode.taskDeKey" :key="nextNode.taskDeKey">
           <v-bpm-next-node :nextNode="nextNode"></v-bpm-next-node>
         </el-tab-pane>
@@ -100,9 +100,4 @@ export default {
     }
   }
 };
-</script>
-<style>
-/* .el-dialog__body {
-  padding: 0px 20px 30px 20px ;
-} */
-</style>
+</script>

package/packages/utils/merit-bpm.js

@@ -100,7 +100,6 @@ MeritBPM.open = function(that, params, callback) {
  *      callback : function(res){ 执行流程相关操作 }
  */
 MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
-  console.log("runzhang"+that)
   let bpmVars = that.getBpmVar(bpmBtn);
   if (typeof bpmBtn == 'object') {
     bpmVars.bpmOperName = bpmBtn.name || ''; //【流程内置变量名】
@@ -129,9 +128,9 @@ MeritBPM.runRuleEngine = function(that, bpmBtn, callback) {
     .catch(function(err) {
       that.$message.error(that.$t('base.operation.error') + err);
     });
-    if(window.opener && window.opener.refreshBpmGrid){
-      window.opener.refreshBpmGrid();
-    }
+  if (window.opener && window.opener.refreshBpmGrid) {
+    window.opener.refreshBpmGrid();
+  }
 };
 
 /**
@@ -158,6 +157,7 @@ MeritBPM.doSend = function(that, bpmBtn) {
     if (
       bpmBtn.isSave == '1' ||
       (that.ruleEngine.procInstId != '' &&
+        that.ruleEngine.procInstId != undefined &&
         that.ruleEngine.editStatus.type != '1')
     ) {
       bpmBtn.isSave = '0';
@@ -272,6 +272,9 @@ MeritBPM.startProcess = function(that, bpmBtn, callback) {
         bpmVars
       )
       .then(function(res) {
+        if (res.data == undefined || res.data == null) {
+          return;
+        }
         Object.assign(that.ruleEngine, res.data);
         MeritBPM.runRuleEngine(that, bpmBtn, callback);
       });