cloud-module-bpm 6.2.6 → 6.2.7

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "cloud-module-bpm",
-  "version": "6.2.6",
+  "version": "6.2.7",
   "description": " bpm base lib",
   "main": "dist/cloud-module-bpm.umd.min.js",
   "author": "wujx",
   "private": false,
   "license": "MIT",
+
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -16,7 +17,7 @@
     "axios": "0.19.0",
     "babel-loader": "^8.0.6",
     "babel-polyfill": "^6.26.0",
-    "cloud-module-base": "6.12.2",
+    "cloud-module-base": "6.12.1",
     "core-js": "^3.4.4",
     "css-loader": "^3.4.1",
     "element-ui": "^2.15.7",

package/packages/bpm-form-tools/bpm-form-tools.vue

@@ -1,14 +1,17 @@
 <template>
   <el-col style="text-align:left">
-    <el-button
-      style="margin-top:5px;"
-      v-for="bpmBtn in MeritBPM.bpmBtns"
-      :key="bpmBtn.id"
-      :type="bpmBtn.type"
-      v-prevent-re-click
-      :class="bpmBtn.id"
-      @click="BPMEventBus('doSend', bpmBtn)"
-    >{{ bpmBtn.name }}</el-button>
+    <template v-for="bpmBtn in MeritBPM.bpmBtns">
+      <el-button
+        style="margin-top:5px;"
+        :key="bpmBtn.id"
+        :type="bpmBtn.type"
+        :disabled="bpmBtn.id =='bpmSaveOrUpdateBtn' && flag"
+        v-prevent-re-click
+        :class="bpmBtn.id"
+        v-if='bpmBtn.name=="填写意见"'
+        @click="BPMEventBus('doSend', bpmBtn)"
+      >{{ bpmBtn.name }}</el-button>
+    </template>
     <bpm-user-select
       :dialogVisible="MeritBPM.userSelectDialogVisible"
       :ruleEngine="ruleEngine"

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

@@ -88,7 +88,7 @@
         <el-button
           type="primary"
           @click="handlePublish"
-        >发布</el-button>
+        >确定</el-button>
       </span>
     </el-dialog>
   </div>