浏览代码

修正自动审核,cron表达式

逆水行舟 1 月之前
父节点
当前提交
be6cf79386
共有 4 个文件被更改,包括 20 次插入17 次删除
  1. 二进制
      dist.zip
  2. 7 7
      src/views/oms/B2BOrder/components/autoAudit.vue
  3. 2 3
      src/views/oms/B2BOrder/index.vue
  4. 11 7
      src/views/omsOrder/lifeCycle/index.vue

二进制
dist.zip


+ 7 - 7
src/views/oms/B2BOrder/components/autoAudit.vue

@@ -44,13 +44,13 @@ export default class AutoAudit extends Vue {
                         defaultIndex: 0,
                         data: [{
                             label: '10分钟',
-                            value: '*/10 * * * *'
+                            value: '0 */10 * * * ?'
                         }, {
                             label: '30分钟',
-                            value: '*/30 * * * *'
+                            value: '0 */30 * * * ?'
                         }, {
                             label: '1小时',
-                            value: '0 * * * *'
+                            value: '0 0 * * * ?'
                         }]
                     }
                 }
@@ -76,7 +76,7 @@ export default class AutoAudit extends Vue {
             const resV = res.rows[0]
             const v = {
                 jobState: resV.jobState === '1' ? true : false,
-                scheduleConf: resV.time == '1' ? '*/10 * * * *' : resV.time == '2' ? '*/30 * * * *' : '0 * * * *'
+                scheduleConf: resV.time == '1' ? '0 */10 * * * ?' : resV.time == '2' ? '0 */30 * * * ?' : '0 0 * * * ?'
             };
             (this.$refs.form as any).setValue(v);
         })
@@ -84,13 +84,13 @@ export default class AutoAudit extends Vue {
 
     btn() {
         let v = (this.$refs.form as any).getValue();
-        if (v.scheduleConf === '*/10 * * * *') {
+        if (v.scheduleConf === '0 */10 * * * ?') {
             v.time = '1'
         }
-        if (v.scheduleConf === '*/30 * * * *') {
+        if (v.scheduleConf === '0 */30 * * * ?') {
             v.time = '2'
         }
-        if (v.scheduleConf === '0 * * * *') {
+        if (v.scheduleConf === '0 0 * * * ?') {
             v.time = '3'
         }
         if (v.jobState === undefined || v.jobState === false) {

+ 2 - 3
src/views/oms/B2BOrder/index.vue

@@ -1211,7 +1211,7 @@ export default class Order extends Vue {
     let data: any = {};
     let params: any = {};
     //data.businessType = 'B2B'
-    params.status = 1;
+    params.state = 1;
     params.pageNo = this.page.pageNo;
     params.pageSize = this.page.pageSize;
     this.load = true;
@@ -1366,8 +1366,7 @@ export default class Order extends Vue {
     for (let i = 0; i < this.data.length; i++) {
       if (!this.data[i].orderTimeout) continue;
       if (this.data[i].isSubmitted === 1) {
-        this.data[i].orderTimeout = '';
-        continue;
+        this.data[i].orderTmeout = '';
       }
 
       const to = this.data[i].orderTimeout;

+ 11 - 7
src/views/oms/lifeCycle/index.vue → src/views/omsOrder/lifeCycle/index.vue

@@ -224,13 +224,17 @@ export default {
     handleUpdate(row) {
       const id = row.id || this.ids
       getLifeCycle(id).then(response => {
-        this.open = true;
-        this.timer = setTimeout(() => {
-          this.reset();
-          this.title = "修改生命周期";
-          this.form = response.data;
-          console.info(this.form, 'sdfsdfs')
-        }, 500);
+        try {
+          this.open = true;
+          this.timer = setTimeout(() => {
+            this.reset();
+            this.title = "修改生命周期";
+            this.form = response.data;
+            console.info(this.form, 'sdfsdfs')
+          }, 500);
+        } catch (err) {
+          console.info(err)
+        }
       });
     },
     /** 提交按钮 */