订单1

src/views/advertise/advertiseList.vue

@@ -28,6 +28,18 @@
                         </el-select>
                     </div>
                 </el-col>
+                <el-col :span="6" class="left">
+                    <div class="searchBox">
+                        <div class="searchTitle">用户名称</div>
+                        <el-input class="input" v-model="user_name" clearable placeholder="请输入用户名称"></el-input>
+                    </div>
+                </el-col>
+                <el-col :span="6" class="left">
+                    <div class="searchBox">
+                        <div class="searchTitle">站点名称</div>
+                        <el-input class="input" v-model="website_name" clearable placeholder="请输入站点名称"></el-input>
+                    </div>
+                </el-col>
                 <el-col :span="8" class="right">
                     <div class="btnList">
                         <button class="search" @click="goSearch">搜索</button>
@@ -42,6 +54,11 @@
             <el-row>
                 <template>
                     <el-table class="my-table" :data="tableData" style="width: 100%">
+                        <el-table-column prop="user_name" label="用户名称" width="110">
+                        </el-table-column>
+
+                        <el-table-column prop="website_name" label="站点名称" width="110">
+                        </el-table-column>
                         <el-table-column fixed prop="id" label="编号" width="80">
                         </el-table-column>
                         <el-table-column prop="order_num" label="工单编号" width="175">
@@ -50,14 +67,18 @@
                         </el-table-column>
                         <el-table-column prop="orderStatus" label="订单状态" width="100">
                         </el-table-column>
+
+                        <el-table-column prop="price" label="总金额" width="110">
+                        </el-table-column>
+
+
                         <el-table-column prop="sttime" label="开始时间" width="">
                         </el-table-column>
                         <el-table-column prop="edtime" label="结束时间" width="">
                         </el-table-column>
                         <el-table-column prop="cttime" label="创建时间" width="">
                         </el-table-column>
-                        <el-table-column prop="price" label="总金额" width="110">
-                        </el-table-column>
+
                         <el-table-column fixed="right" label="操作" width="330">
                             <template slot-scope="scope">
                                 <div class="listBtnBox">
@@ -127,7 +148,8 @@
                         </el-col> -->
                     </el-form-item>
                     <el-form-item label="广告尺寸:" prop="">
-                        <el-radio v-model="ruleForm.radio" v-for="(item,index) in adSizeList" :key="index" disabled :label=item.id>{{ item.width+'x'+item.height }}</el-radio>
+                        <el-radio v-model="ruleForm.radio" v-for="(item, index) in adSizeList" :key="index" disabled
+                            :label=item.id>{{ item.width + 'x' + item.height }}</el-radio>
                     </el-form-item>
 
                     <el-form-item label="价格:" prop="price">
@@ -156,7 +178,7 @@
                         <span class="example" @click="goGraph">查看示例图</span>
                         <div>
                             <el-button disabled v-for="item in ruleForm.adPlace" class="el_btnList">{{ item
-                            }}</el-button>
+                                }}</el-button>
                         </div>
                     </el-form-item>
                 </div>
@@ -220,7 +242,7 @@ import tableTitle from './components/tableTitle.vue';
 
 //引入公用样式
 import '@/styles/global.less';
-import { getStatus, getOrderList, getOrderListAdmin, getOrderDetail, getOrderDetailAdmin, applyOrderStatusAdmin, editOrderAdmin, rejectOrderAdmin, endOrderAdmin, delOrderAdmin,getSize } from '@/api/advertise'
+import { getStatus, getOrderList, getOrderListAdmin, getOrderDetail, getOrderDetailAdmin, applyOrderStatusAdmin, editOrderAdmin, rejectOrderAdmin, endOrderAdmin, delOrderAdmin, getSize } from '@/api/advertise'
 export default {
     components: {
         tableTitle,//表格标题-
@@ -238,6 +260,8 @@ export default {
             // 搜索框相关
             order_code: '', //工单编号 
             order_status: '',//订单状态
+            user_name: '', //用户名称
+            website_name: '', //站点名称
             order: [ //订单状态数据
                 {
                     value: 1,
@@ -321,6 +345,8 @@ export default {
                 data.append('pageSize', this.pageSize)
                 data.append('status', this.order_status)
                 data.append('order_num', this.order_code)
+                data.append('user_name', this.user_name)
+                data.append('website_name', this.website_name)
 
                 getOrderListAdmin(data).then(data => {
                     console.log(data);
@@ -434,6 +460,8 @@ export default {
             data.append('pageSize', this.pageSize)
             data.append('status', this.order_status)
             data.append('order_num', this.order_code)
+            data.append('user_name', this.user_name)
+            data.append('website_name', this.website_name)
             console.log(data);
 
             getOrderListAdmin(data).then(data => {
@@ -461,6 +489,8 @@ export default {
         goReset() {
             this.order_code = ''
             this.order_status = ''
+            this.user_name = ''
+            this.website_name = ''
             this.page = 1
             this.pageSize = 10
             this.getData();
@@ -475,9 +505,9 @@ export default {
             this.ruleForm.name = val.name
             if (val.width == 1200 && val.height == 90) {
                 this.ruleForm.radio = 1
-            } else if(val.width == 830 && val.height == 110) {
+            } else if (val.width == 830 && val.height == 110) {
                 this.ruleForm.radio = 2
-            } else if(val.width == 450 && val.height == 290) {
+            } else if (val.width == 450 && val.height == 290) {
                 this.ruleForm.radio = 3
             }
             this.ruleForm.startTime = val.sttime
@@ -738,9 +768,9 @@ export default {
         getAdSize() {
             getSize().then(res => {
                 console.log("广告尺寸", res.data);
-                this.adSizeList = res.data; 
-                for(let item of this.adSizeList){
-                    ad_size=item.width+'x'+item.height
+                this.adSizeList = res.data;
+                for (let item of this.adSizeList) {
+                    ad_size = item.width + 'x' + item.height
                 }
             })
         }