梁展鹏 3 роки тому
батько
коміт
f3daeebd58

+ 6 - 6
src/views/baseManagement/infoManagement/toolbar.vue

@@ -17,17 +17,17 @@ export default {
           label: '标题'
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '发布时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'status',
           label: '状态',
           options: TYPE,
           format: val => (val !== null && val !== '' ? !!val : null)
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '发布时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 6 - 6
src/views/financialManagement/orderManagement/toolbar.vue

@@ -28,17 +28,17 @@ export default {
           options: setStatus(['积分', '微信', '支付宝'], ['积分', '微信', '支付宝'])
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '支付时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'state',
           label: '订单状态',
           options: setStatus(['未支付', '已支付', '待支付'], [-1, 1, 0]),
           format: val => (val !== null && val !== '' ? val : null)
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '支付时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 5 - 5
src/views/memberManagement/memberList/toolbar.vue

@@ -28,11 +28,6 @@ export default {
         {
           type: 'select',
           name: 'date',
-          label: '状态'
-        },
-        {
-          type: 'select',
-          name: 'date',
           label: '角色'
         },
         {
@@ -45,6 +40,11 @@ export default {
           name: 'date',
           label: '反馈时间',
           apiName: ['start', 'end']
+        },
+        {
+          type: 'select',
+          name: 'date',
+          label: '状态'
         }
       ]
     };

+ 7 - 7
src/views/photoManagement/eventsList/toolbar.vue

@@ -22,18 +22,18 @@ export default {
           label: '活动名称'
         },
         {
-          type: 'select',
-          name: 'isShow',
-          label: '状态',
-          options: TYPE,
-          format: val => (val !== null && val !== '' ? !!val : null)
-        },
-        {
           type: 'dateArray',
           name: 'date',
           label: '活动开始时间',
           apiName: ['startTime', 'endTime'],
           labelWidth: '100px'
+        },
+        {
+          type: 'select',
+          name: 'isShow',
+          label: '状态',
+          options: TYPE,
+          format: val => (val !== null && val !== '' ? !!val : null)
         }
       ]
     };

+ 6 - 6
src/views/photoManagement/imageGoodsManagement/toolbar.vue

@@ -18,17 +18,17 @@ export default {
           label: '活动'
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '上传时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'auditStatus',
           label: '状态',
           options: AUDITTYPE,
           format: val => val
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '上传时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 6 - 6
src/views/photoManagement/photoVerifyManagement/toolbar.vue

@@ -18,18 +18,18 @@ export default {
           label: '活动'
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '上传时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'auditStatus',
           label: '状态',
           options: AUDITTYPE,
           format: val => val,
           defaultValue: 0
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '上传时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 6 - 6
src/views/photographerManagement/photoVerify/toolbar.vue

@@ -17,17 +17,17 @@ export default {
           label: '活动'
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '上传时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'auditStatus',
           label: '状态',
           options: AUDITTYPE,
           format: val => val
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '上传时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 7 - 7
src/views/sceneManagement/sceneList/toolbar.vue

@@ -26,13 +26,6 @@ export default {
         },
         {
           type: 'select',
-          name: 'status',
-          label: '状态',
-          options: TYPE,
-          format: val => (val !== null && val !== '' ? !!val : null)
-        },
-        {
-          type: 'select',
           name: 'type',
           label: '机构类型',
           options: SCENETYPE
@@ -41,6 +34,13 @@ export default {
           type: 'text',
           name: 'phonenumber',
           label: '办公号码'
+        },
+        {
+          type: 'select',
+          name: 'status',
+          label: '状态',
+          options: TYPE,
+          format: val => (val !== null && val !== '' ? !!val : null)
         }
       ]
     };

+ 7 - 7
src/views/sceneManagement/sceneVerify/toolbar.vue

@@ -26,13 +26,6 @@ export default {
         },
         {
           type: 'select',
-          name: 'status',
-          label: '状态',
-          options: AUDITTYPE,
-          format: val => val
-        },
-        {
-          type: 'select',
           name: 'type',
           label: '机构类型',
           options: SCENETYPE
@@ -41,6 +34,13 @@ export default {
           type: 'text',
           name: 'personPhonenumber',
           label: '手机号码'
+        },
+        {
+          type: 'select',
+          name: 'status',
+          label: '状态',
+          options: AUDITTYPE,
+          format: val => val
         }
       ]
     };

+ 6 - 6
src/views/statistics/withdrawalRecord/toolbar.vue

@@ -23,18 +23,18 @@ export default {
           labelWidth: '100px'
         },
         {
+          type: 'dateArray',
+          name: 'date',
+          label: '反馈时间',
+          apiName: ['startTime', 'endTime']
+        },
+        {
           type: 'select',
           name: 'status',
           label: '状态',
           options: AUDITTYPE,
           format: val => val,
           defaultValue: 0
-        },
-        {
-          type: 'dateArray',
-          name: 'date',
-          label: '反馈时间',
-          apiName: ['startTime', 'endTime']
         }
       ]
     };

+ 5 - 5
src/views/systemManagement/accountManagement/index.vue

@@ -105,17 +105,17 @@ export default {
           tagName: row => row.gender === 0 ? '未知' : row.gender === 1 ? '男' : '女'
         },
         {
+          key: 'createAt',
+          name: '注册时间',
+          width: this.$col.b
+        },
+        {
           key: 'isLocked',
           name: '封锁状态',
           width: '80',
           type: 'tag',
           fetchTagType: val => (val ? 'danger' : 'info'),
           tagName: row => (row.isLocked ? '是' : '否')
-        },
-        {
-          key: 'createAt',
-          name: '注册时间',
-          width: this.$col.b
         }
         // {
         //   key: 'action',