@lambo-design/workflow-approve 1.0.0-beta.87 → 1.0.0-beta.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.87",
+  "version": "1.0.0-beta.88",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/components/assignee-box.vue

@@ -278,6 +278,10 @@ export default {
     onOk(){
       let self = this
       let idSelectedArr = self.idSelectedArr
+      if (self.idSelectedArr.length === 0) {
+        self.onCancel()
+        return
+      }
       self.loading = true
       if (self.helpBoxType ==='addMultitaskInstance'){
         idSelectedArr = [...new Set(idSelectedArr)]

package/src/components/opinion.vue

@@ -59,6 +59,11 @@ export default {
     UploadFile
   },
   props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
     attachmentFile:{
       type: Boolean,
       default: false,
@@ -289,7 +294,7 @@ export default {
     },
   },
   mounted() {
-    this.auditOpinion = this.defaultAuditOpinion
+    this.auditOpinion = this.defaultAuditOpinion || this.value
   },
   watch: {
     auditOpinionText(label) {
@@ -298,6 +303,9 @@ export default {
     auditOpinion(val) {
       this.$emit('input', val)
     },
+    value(newVal) {
+      this.auditOpinion = newVal;
+    },
     defaultAuditOpinion(val) {
       this.auditOpinion = this.defaultAuditOpinion
       this.$emit('input', val)

package/src/components/process-info.vue

@@ -198,6 +198,11 @@ export default {
     LamboPagingTable,
   },
   props: {
+    value: {
+      type: String,
+      required: false,
+      default: ''
+    },
     isDetail: {
       type: Boolean,
       required: false,
@@ -515,11 +520,15 @@ export default {
   mounted() {
     this.getAttachList(this.taskId)
     this.processInfoWidth = this.inHorizontal ? 1000 : this.portraitWidth
+    this.form.auditOpinion = this.value;
   },
   watch: {
     'form.auditOpinion'(val) {
       this.$emit('input', val)
     },
+    value(newVal) {
+      this.form.auditOpinion = newVal;
+    },
     defaultAuditOpinion(val) {
       this.auditOpinion = this.defaultAuditOpinion
       this.$emit('input', val)

package/src/portrait.vue

@@ -165,9 +165,7 @@
       </Table>
     </Modal>
     <!--  下一环节设置弹框  -->
-    <Modal v-model="appointBoxShow" title="下一环节设置"
-           @on-cancel="appointBoxShow = false" width="600"
-           @on-ok="appointOk">
+    <Modal v-model="appointBoxShow" title="下一环节设置" width="600">
       <Card v-for="(item,index) of nextNodesFormList" :key="index" style="margin-bottom: 10px"
             v-if="handleButtons && (handleButtons.includes('appointHandler') || handleButtons.includes('appointTimeoutTime'))">
         <Form ref="appointBox" justify="center" :label-width="100" :model="item"
@@ -250,6 +248,10 @@
           </div>
         </Form>
       </Card>
+      <template slot="footer">
+        <Button @click="appointBoxShow = false">取消</Button>
+        <Button type="primary" @click="appointOk">确定</Button>
+      </template>
     </Modal>
     <Modal v-model="rejectAttributesBoxShow" title="驳回的节点通过后"
            @on-cancel="rejectAttributesCancel"
@@ -1301,6 +1303,7 @@ export default {
       }
       if (self.form.auditOpinion == '' || self.form.auditOpinion == null) {
         if (self.auditResult === '30') {
+          self.form.auditOpinion = '通过'
           self.auditParams.auditOpinion = '通过'
           self.businessFormSave ? self.businessFormSave(self.handleSaveResult, auditResult) : self.handleSaveResult(true)
           return
@@ -1765,6 +1768,7 @@ export default {
     appointOk() {
       const self = this
       let oldSettings
+      let illegalNodes = []
       let params = this.nextNodesFormList.reduce((acc, item) => {
         acc[item.id] = {
           needUpdate: 'false',
@@ -1779,17 +1783,25 @@ export default {
           acc[item.id].timeLimit = ''
         }
         oldSettings = self.nextNodesOldSettings.filter(oldSetting => oldSetting.id === item.id)[0]
+        if ((!item.assignee && !oldSettings.assignee && !item.candidateGroups && !oldSettings.candidates) || (item.isMultiInstance && !item.candidateGroups && !oldSettings.candidates)){
+          illegalNodes = [...illegalNodes, item.name]
+        }
         if (oldSettings.assignee !== item.assignee || self.checkGroupsUpdate(oldSettings.candidates, item.candidateGroups, item.isMultiInstance) || self.checkTimeLimitUpdate(oldSettings.timeLimit, timeLimit)) {
           acc[item.id].needUpdate = 'true'
         }
         return acc
       }, {})
+      if (illegalNodes.length > 0){
+        self.$Message.error(`请选择节点${illegalNodes.join(',')}的审批人！`);
+        return
+      }
       self.auditParams.nodeConfigMaps = JSON.stringify(params)
       self.doPass((execResult, instanceId, taskIds, auditResult, curTaskId) => {
         if (this.executionCompleted) {
           this.executionCompleted(execResult, instanceId, taskIds, auditResult, curTaskId)
         }
       })
+      self.appointBoxShow = false
     },
     checkGroupsUpdate(oldSetting, newSetting, isMultiInstance) {
       if (oldSetting && newSetting) {