mooho-base-admin-plus 2.10.67 → 2.10.69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.67",
+  "version": "2.10.69",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/api/task.js

@@ -15,12 +15,13 @@ export default {
       }
     });
   },
-  reject(id, comment) {
+  reject(id, rejectToID, comment) {
     return request({
       url: `api/${res}/reject`,
       method: 'post',
       data: {
         id,
+        rejectToID,
         comment
       }
     });
@@ -89,5 +90,14 @@ export default {
       method: 'post',
       data: filter
     });
+  },
+  queryRejectTo(id) {
+    return request({
+      url: `api/${res}/queryRejectTo`,
+      method: 'get',
+      params: {
+        id
+      }
+    });
   }
 };

package/src/components/view/modal-table.vue

@@ -651,6 +651,14 @@
          * 数据变化事件
          */
         this.$emit('on-select-change');
+      },
+      /**
+       * 重置筛选
+       *
+       * @public
+       */
+      resetFilter() {
+        this.$refs.table.resetFilter();
       }
     }
   };

package/src/components/view/view-form.vue

@@ -664,7 +664,7 @@
                   }
                 }
               });
-            } else if (column.controlType == 'Attachment' && this.$refs['attachment_' + column.code]) {
+            } else if (column.controlType == 'Attachment' && this.$refs['attachment_' + column.code] && this.$refs['attachment_' + column.code].length > 0) {
               this.$refs['attachment_' + column.code][0].setData(this.parseData(this.data, column.code));
             }
           });

package/src/components/view/view-table-excel.vue

@@ -111,6 +111,7 @@
             if (column.controlType === 'DialogSelect' && !column.readonly) {
               this.$refs.dialogTable.init(column.source, () => {
                 this.$refs.dialogTable.open(this.getParam(this.staticData[coords.row], column, this.parentData));
+                this.$refs.dialogTable.resetFilter();
               });
             }
           }

package/src/components/workflow/flow-chart.vue

@@ -365,6 +365,29 @@
             </Option>
           </Select>
         </template>
+        <template v-if="code == 'rejectActivityPids'">
+          <Select
+            :model-value="parseArrayData(data, code)"
+            @update:model-value="$event => setArrayData(data, code, $event)"
+            :clearable="true"
+            :transfer="true"
+            :multiple="true"
+            v-if="activities"
+          >
+            <Option
+              v-for="item in activities.filter(item => {
+                return (
+                  item.pid != data.pid &&
+                  (item.activityType == 'Interactive' || item.activityType == 'Judgement' || item.activityType == 'Service' || item.activityType == 'ParallelStart')
+                );
+              })"
+              :key="item.pid"
+              :value="item.pid"
+            >
+              {{ item.name }}
+            </Option>
+          </Select>
+        </template>
       </template>
     </modal-form>
     <modal-form ref="serviceForm" view-code="ServiceActivityEdit">

package/src/components/workflow/task-form.vue

@@ -86,6 +86,20 @@
         <Button type="default" custom-icon="fa fa-times" @click="messageOpened = false">{{ $t('Front_Btn_Close') }}</Button>
       </template>
     </Modal>
+    <modal-form ref="rejectForm" view-code="RejectTask">
+      <template #column="{ data, code }">
+        <template v-if="code == 'rejectTo'">
+          <Select v-model="$refs.rejectForm.data.rejectToID" :clearable="true" placeholder="退回发起人" :transfer="true">
+            <Option v-for="item in rejectActivities" :key="item.id" :value="item.id">
+              {{ item.name }}
+            </Option>
+          </Select>
+        </template>
+      </template>
+      <template #footer>
+        <Button type="primary" custom-icon="fa fa-check" @click="rejectSubmit()">{{ $t('Front_Btn_OK') }}</Button>
+      </template>
+    </modal-form>
     <flow-chart ref="flowChart" />
   </div>
 </template>
@@ -124,7 +138,8 @@
         description: null,
         customComponent: null,
         form: null,
-        isFullscreen: false
+        isFullscreen: false,
+        rejectActivities: []
       };
     },
     async created() {},
@@ -302,7 +317,7 @@
           );
         }
       },
-      // 拒绝
+      // 打开拒绝表单
       async reject() {
         if (this.isCustom && typeof this.$refs.customComponent.rejectValidation === 'function') {
           let isOK = await this.$refs.customComponent.rejectValidation();
@@ -312,30 +327,40 @@
           }
         }
 
-        this.confirmInput(
-          'Front_Msg_Sure_To_Reject_Application',
-          this.$t('Front_Label_Comment'),
-          async () => {
-            if (this.isCustom && typeof this.$refs.customComponent.beforeReject === 'function') {
-              await this.$refs.customComponent.beforeReject(this.comment);
-            }
+        console.log('xxx', this.task.activityInst.activityID);
 
-            await taskApi.reject(this.task.id, this.comment);
+        let column = this.$refs.rejectForm.columns.find(item => item.code == 'rejectTo');
+
+        if (column) {
+          if (this.task.activityInst.activity.isRejectSelect == true) {
+            this.rejectActivities = await taskApi.queryRejectTo(this.task.id);
+            column.isShow = true;
+          } else {
+            column.isShow = false;
+          }
+        }
+
+        this.$refs.rejectForm.open();
+      },
+      // 拒绝提交
+      async rejectSubmit() {
+        let isOK = await this.$refs.rejectForm.validate();
+
+        if (!isOK) {
+          this.error('Front_Msg_Form_Validate_Fail');
+        } else {
+          this.confirm('Front_Msg_Sure_To_Reject_Application', async () => {
+            let model = this.$refs.rejectForm.data;
+
+            await taskApi.reject(this.task.id, model.rejectToID, model.comment);
             this.success('Front_Msg_Success');
             this.resetNotice();
             this.$emit('on-after-action');
+            this.$refs.rejectForm.data = {};
+            this.$refs.rejectForm.close();
             this.opened = false;
-          },
-          comment => {
-            if (!(comment || '').trim()) {
-              this.warning('Front_Msg_Please_Input_Reject_Reason');
-              return false;
-            } else {
-              this.comment = comment;
-              return true;
-            }
-          }
-        );
+          });
+        }
       },
       // 撤回
       async recall() {