mooho-base-admin-plus 2.10.63 → 2.10.65

package/package.json

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

package/src/api/task.js

@@ -56,6 +56,17 @@ export default {
       }
     });
   },
+  batchRedirect(sourceID, targetID, comment) {
+    return request({
+      url: `api/${res}/batchRedirect`,
+      method: 'post',
+      data: {
+        sourceID,
+        targetID,
+        comment
+      }
+    });
+  },
   batchDo(ids) {
     return request({
       url: `api/${res}/batchDo`,

package/src/components/view/mixin.js

@@ -111,6 +111,7 @@ export default {
           if (item.defaultValue.startsWith('{today}')) {
             // 当前日期
             let date = new Date();
+            date.setHours(0, 0, 0, 0);
 
             if (item.defaultValue.indexOf('+') != -1) {
               date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));
@@ -118,11 +119,27 @@ export default {
               date.setDate(date.getDate() - parseInt(item.defaultValue.split('-')[1]));
             }
 
-            let value = date.toISOString().replace(/T.*/, '');
-            setData(data, item, new Date(value));
+            let format = 'yyyy-MM-dd HH:mm:ss';
+
+            if (item.controlType == 'Date') {
+              format = 'yyyy-MM-dd';
+            } else if (item.controlType == 'Time') {
+              format = 'HH:mm:ss';
+            } else if (item.controlType == 'DateTime') {
+              format = 'yyyy-MM-dd HH:mm:ss';
+            } else if (item.controlType == 'Year') {
+              format = 'yyyy';
+            } else if (item.controlType == 'Month') {
+              format = 'yyyy-MM';
+            } else {
+              format = 'yyyy-MM-dd';
+            }
+
+            setData(data, item, dateFormat(date, format));
           } else if (item.defaultValue.startsWith('{today(')) {
             // 当前日期
             let date = new Date();
+            date.setHours(0, 0, 0, 0);
 
             if (item.defaultValue.indexOf('+') != -1) {
               date.setDate(date.getDate() + parseInt(item.defaultValue.split('+')[1]));

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

@@ -290,7 +290,6 @@
   import modelApi from '../../api/model';
   import customModelApi from '../../api/customModel';
   import DialogSelect from '../input/dialog-select.vue';
-  import dateFormat from 'date-fns/format';
 
   export default {
     mixins: [mixin, mixinPage],

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

@@ -775,8 +775,9 @@
         });
 
         this.data = {};
-
-        this.clearValidate();
+        setTimeout(() => {
+          this.clearValidate();
+        });
       },
       /**
        * 重置表格页码

package/src/pages/system/batchRedirect.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <div class="i-layout-page-header">
+      <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
+    </div>
+    <Card :bordered="false" dis-hover class="ivu-mt">
+      <view-form ref="form" view-code="BatchRedirect"></view-form>
+      <div style="text-align: center">
+        <Button type="info" custom-icon="fa fa-share" @click="batchRedirect()">{{ $t('Front_Btn_Redirect') }}</Button>
+      </div>
+    </Card>
+  </div>
+</template>
+<script>
+  import mixinPage from '../../mixins/page';
+  import taskApi from '../../api/task';
+
+  export default {
+    name: 'system-batchRedirect',
+    mixins: [mixinPage],
+    components: {},
+    data() {
+      return {};
+    },
+    computed: {},
+    created() {},
+    methods: {
+      // 批量转移
+      async batchRedirect() {
+        let isOK = await this.$refs.form.validate();
+
+        if (!isOK) {
+          this.error('Front_Msg_Form_Validate_Fail');
+        } else {
+          let model = this.$refs.form.data;
+
+          this.confirm('Front_Msg_Sure_To_Redirect_Application|' + model.target.name, async () => {
+            await taskApi.batchRedirect(model.sourceID, model.targetID, model.comment);
+            this.success('Front_Msg_Success');
+            this.resetNotice();
+
+            setTimeout(() => {
+              this.$refs.form.reset();
+            });
+          });
+        }
+      }
+    }
+  };
+</script>