搜索

ClientPlatform/src/pages/order/order.vue

@@ -1,10 +1,20 @@
 <template>
   <div class="page-box">
     <div class="search-box">
+      <div class="search">
+        <el-input placeholder="订单名称" v-model="keyword"></el-input
+        >&nbsp;&nbsp;
+        <el-button type="primary" icon="el-icon-search" @click="findList1"
+          >搜索</el-button
+        >
+      </div>
+
       <!--            <el-input placeholder="任务Id"></el-input>&nbsp;&nbsp;-->
-      <el-button type="primary" icon="el-icon-plus" @click="AddOrder"
-        >ADD
-      </el-button>
+      <div>
+        <el-button type="primary" icon="el-icon-plus" @click="AddOrder"
+          >ADD
+        </el-button>
+      </div>
     </div>
     <div>
       <vxe-table
@@ -78,6 +88,7 @@ export default {
     return {
       loading1: false,
       orderStatus,
+      keyword: "",
       tableData1: [],
       tablePage1: {
         currentPage: 1,
@@ -99,6 +110,7 @@ export default {
       const token = localStorage.getItem("token");
       const res = await getOrder({
         token,
+        keyword: this.keyword,
         page: this.tablePage1.currentPage,
         pageSize: this.tablePage1.pageSize,
       });
@@ -208,6 +220,10 @@ export default {
     margin-top: 24px;
     padding-top: 24px;
     margin-bottom: 24px;
+    justify-content: space-between;
+    .search {
+      display: flex;
+    }
   }
 
   .list-box {

admin_site/order/migrations/0001_initial.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.1.7 on 2023-05-01 10:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Order',
+            fields=[
+                ('id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('user_id', models.CharField(blank=True, max_length=255, null=True)),
+                ('name', models.CharField(blank=True, max_length=10, null=True)),
+                ('source', models.CharField(blank=True, max_length=100, null=True)),
+                ('run_time', models.DateTimeField()),
+                ('create_time', models.DateTimeField(auto_now_add=True)),
+                ('update_time', models.DateTimeField(auto_now=True)),
+                ('end_time', models.DateTimeField(null=True)),
+                ('start_time', models.DateTimeField(null=True)),
+                ('desc', models.TextField(blank=True, null=True)),
+                ('status', models.IntegerField(default=0)),
+                ('is_delete', models.IntegerField(default=0)),
+            ],
+        ),
+    ]

admin_site/order/migrations/0002_alter_order_options_order_status2.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.1.7 on 2023-04-14 09:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('order', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='order',
-            options={'verbose_name': 'Order', 'verbose_name_plural': 'Order'},
-        ),
-        migrations.AddField(
-            model_name='order',
-            name='status2',
-            field=models.IntegerField(default=0),
-        ),
-    ]

admin_site/order/migrations/0003_remove_order_status2.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.1.7 on 2023-04-14 09:17
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('order', '0002_alter_order_options_order_status2'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='order',
-            name='status2',
-        ),
-    ]

admin_site/order/migrations/0004_alter_order_options_order_user_id.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.1.7 on 2023-04-17 14:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('order', '0003_remove_order_status2'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='order',
-            options={},
-        ),
-        migrations.AddField(
-            model_name='order',
-            name='user_id',
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

admin_site/order/views.py

@@ -167,7 +167,7 @@ def list(request):
 
     data_list = Order_models.objects.filter(is_delete=0)
     if keyword:
-        query = Q(title__icontains=keyword)
+        query = Q(name__icontains=keyword)
         data_list = data_list.filter(query)
 
     try: