mooho-base-admin-plus 2.5.36 → 2.6.0

package/package.json

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

package/src/api/task.js

@@ -61,5 +61,12 @@ export default {
       method: 'post',
       data: filter
     });
+  },
+  queryMyDone(filter) {
+    return request({
+      url: `api/${res}/queryMyDone`,
+      method: 'post',
+      data: filter
+    });
   }
 };

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

@@ -107,7 +107,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :maxlength="column.maxLength"
                   :placeholder="column.description"
@@ -122,7 +122,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? '100px' : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :max="column.maxValue"
@@ -136,7 +136,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{
                     width: column.controlWidth == null ? null : column.controlWidth + 'px',
                     'min-width': column.controlWidth == null ? null : column.controlWidth + 'px'
@@ -154,7 +154,7 @@
                   @update:model-value="$event => setArrayData(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
                   :multiple="true"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -169,7 +169,7 @@
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :data="getDataSource(data, column)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -184,7 +184,7 @@
                   :disabled="readonly || column.isReadonly"
                   :multiple="true"
                   :show-checkbox="true"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -265,7 +265,7 @@
                   :model-value="parseDataWithOther(data, column)"
                   @update:model-value="$event => setDataWithOther(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"

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

@@ -146,7 +146,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :maxlength="column.maxLength"
                 :pattern="column.pattern"
@@ -176,7 +176,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 @on-change="onDataChange(rowData(row, index), column)"
@@ -189,7 +189,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 :transfer="true"
@@ -205,7 +205,7 @@
                 @update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
                 :multiple="true"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 :transfer="true"
@@ -288,7 +288,7 @@
                   @update:model-value="$event => setDataWithOther(rowData(row, index), column.code, $event)"
                   size="small"
                   :disabled="isReadonly(rowData(row, index), column)"
-                  :clearable="true"
+                  :clearable="!isReadonly(rowData(row, index), column)"
                   :style="{
                     width:
                       parseDataWithOther(rowData(row, index), column) == '__Other'

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

@@ -110,13 +110,15 @@
     methods: {
       // 打开
       async open(row) {
+        console.log('row', row);
+
         let applicationType = row.processInst.applicationType;
         this.outcomes = [];
         this.task = row;
-        this.isRejectable = this.task.activityInst.activity.isRejectable;
-        this.isBackable = this.task.activityInst.activity.isBackable;
-        this.isRedirectable = this.task.activityInst.activity.isRedirectable;
-        this.isMessageEnable = this.task.processInst.isMessageEnable;
+        this.isRejectable = this.task.activityInst.activity.isRejectable && this.task.status == 'Pending';
+        this.isBackable = this.task.activityInst.activity.isBackable && this.task.status == 'Pending';
+        this.isRedirectable = this.task.activityInst.activity.isRedirectable && this.task.status == 'Pending';
+        this.isMessageEnable = this.task.processInst.isMessageEnable && this.task.status == 'Pending';
         this.isCustom = false;
 
         setTimeout(async () => {
@@ -126,7 +128,7 @@
             return;
           } else if (this.task.activityInst.activity.pageMode == 'Component') {
             // 动态组件
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.customComponent = markRaw(this.$pages[this.task.activityInst.activity.templateUrl]); // 动态组件
             this.isCustom = true;
 
@@ -143,7 +145,7 @@
             });
           } else if (this.task.activityInst.activity.pageMode == 'Form') {
             this.form = this.$refs.form;
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.form.init(this.task.activityInst.activity.formViewCode, async view => {
               if (view.dataView.isCustom) {
                 this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
@@ -167,7 +169,7 @@
             return;
           } else if (applicationType.pageMode == 'Component') {
             // 动态组件
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.customComponent = markRaw(this.$pages[applicationType.templateUrl]); // 动态组件
             this.isCustom = true;
 
@@ -184,7 +186,7 @@
             });
           } else if (applicationType.pageMode == 'Form') {
             this.form = this.$refs.form;
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.form.init(applicationType.formViewCode, async view => {
               if (view.dataView.isCustom) {
                 this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
@@ -208,8 +210,10 @@
             return;
           }
 
-          let res = await modelApi.query('Outcome', { activityFromID: row.activityInst.activityID });
-          this.outcomes = res.data;
+          if (this.task.status == 'Pending') {
+            let res = await modelApi.query('Outcome', { activityFromID: row.activityInst.activityID });
+            this.outcomes = res.data;
+          }
         });
       },
       // 自定义组件就绪

package/src/pages/common/todo.vue

@@ -4,14 +4,25 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" view-code="TodoList" :select-enable="true">
-        <template #filterCommand>
-          <Button size="small" type="primary" custom-icon="fa fa-check-double" @click="batchDo">{{ $t('Front_Btn_Batch_Do') }}</Button>
-        </template>
-        <template #command="{ row }">
-          <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
-        </template>
-      </view-table>
+      <Tabs value="todo">
+        <TabPane label="待办" name="todo">
+          <view-table ref="table" view-code="TodoList" :select-enable="true">
+            <template #filterCommand>
+              <Button size="small" type="primary" custom-icon="fa fa-check-double" @click="batchDo">{{ $t('Front_Btn_Batch_Do') }}</Button>
+            </template>
+            <template #command="{ row }">
+              <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
+            </template>
+          </view-table>
+        </TabPane>
+        <TabPane label="已办" name="done">
+          <view-table ref="table" view-code="DoneList">
+            <template #command="{ row }">
+              <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
+            </template>
+          </view-table>
+        </TabPane>
+      </Tabs>
     </Card>
     <task-form ref="taskForm" @on-after-action="$refs.table.loadData()"></task-form>
   </div>