mooho-base-admin-plus 2.10.66 → 2.10.68

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.66",
+  "version": "2.10.68",
   "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/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

@@ -663,7 +663,7 @@
           if (column.isRequired) {
             return 'text-required';
           } else {
-            return 'text';
+            return null;
           }
         } else if (column.controlType === 'NumberInput') {
           if (column.isRequired) {

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() {

package/src/i18n/locale/en-US.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};

package/src/i18n/locale/lang.js

@@ -1 +1 @@
-const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};
+const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};

package/src/i18n/locale/zh-CN.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};