Merge branch 'pre' of http://git.bjzxtw.org.cn:3000/zxt/admin_home into pre

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
                 }
             })
         }

src/views/news/addNcomplaint.vue

@@ -153,7 +153,6 @@ export default {
         city_arr_id: [],//行政区划
         city_id: '',//城市id
         content: "",
-        timelist: "",
         file: "",//文件路径
         department_arr_id: [],//部门id
         department_id: '',//部门id
@@ -397,7 +396,6 @@ export default {
           }
 
           delete this.form.cat_arr_id;
-          delete this.form.timelist;
           delete this.form.catid;
           this.form.file = this.file;
           console.log(this.form, 'this.form-----------------')
@@ -475,7 +473,6 @@ export default {
         this.form.city_id = res.data.city_id;
         this.form.department_id = res.data.department_id;
         this.form.cat_id = res.data.cat_id;
-        this.form.time = [res.data.start, res.data.end];
         this.form.file = res.data.file;
         this.file = res.data.file;
         const filePath = res.data.file;
@@ -483,6 +480,8 @@ export default {
         this.fileType = fileExtension; // 设置文件类型
         this.form.is_group = parseInt(res.data.is_group);
         this.form.group_name = res.data.group_name;
+        this.form.want = res.data.want;
+        this.form.start = res.data.start ? new Date(res.data.start) : null; // 处理时间格式
       })
     },
     async loadCascaderPath(path) {
@@ -519,14 +518,12 @@ export default {
       //添加要修改的id
       this.form.id = this.editId;
       //先进行验证
-      if (this.form.islong == 1 && this.form.validity == null) {
-        this.form.validity = '1970-01-01 00:00:00';
-      }
+
       this.$refs.form.validate(valid => {
 
         if (valid) {
-          if (this.form.validity) {
-            this.form.validity = formatLocalDate(this.form.validity);
+          if (this.form.start) {
+            this.form.start = formatLocalDate(this.form.start);
           }
           if (this.form.department_arr_id.length == 0) {
             this.form.department_id = 0;
@@ -543,14 +540,9 @@ export default {
             this.form.department_id = this.form.department_arr_id.at(-1) || 0;
             this.form.department_arr_id = JSON.stringify(this.form.department_arr_id);
           }
-          console.log(typeof this.form.time, '---=-==-=')
-          if (typeof this.form.time == 'object' && this.form.time.length > 0) {
-            this.form.start = this.formatDate(this.form.time[0]);
-            this.form.end = this.formatDate(this.form.time[1]);
-            delete this.form.time;
-          }
+
           delete this.form.cat_arr_id;
-          delete this.form.timelist;
+          delete this.form.time;
           delete this.form.catid;
           this.form.file = this.file;
           console.log(this.form, 'this.form-----------------')
@@ -592,6 +584,14 @@ export default {
 
   },
   watch: {
+    '$route'(to, from) {
+      console.log(from, '---------------------------------------');
+      // 监听路由参数中的 id 变化，若变化则更新页面状态并获取数据
+      if (to.query.id) {
+        this.getMainData();
+      }
+    },
+
   },
   mounted() {
     //1.判断是新建还是回显

src/views/news/addNotice.vue

@@ -595,6 +595,14 @@ export default {
 
   },
   watch: {
+    '$route'(to, from) {
+      console.log(from, '---------------------------------------');
+      // 监听路由参数中的 id 变化，若变化则更新页面状态并获取数据
+      if (to.query.id) {
+        this.getMainData();
+      }
+    },
+
   },
   mounted() {
     //1.判断是新建还是回显

src/views/news/ncomplaintList.vue

@@ -5,19 +5,20 @@
       <div class="layerBoxLine">
         <el-row>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">投诉主题：</div>
               <el-input placeholder="请输入投诉主题" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">投诉类型：</div>
               <el-input placeholder="请输入投诉类型" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">处理状态：</div>
               <el-select v-model="getApiData.deal" placeholder="请处理状态..">
@@ -57,16 +58,33 @@
             </el-table-column>
             <el-table-column prop="cityname" label="接收人" width="">
             </el-table-column>
-            <el-table-column prop="level" label="处理状态" width="">
+
+            <el-table-column prop="status" label="审核状态" width="">
               <template slot-scope="scope">
-                <span v-if="scope.row.level == 1">
-                  常规
+                <span v-if="scope.row.status == 1">
+                  未审核
+                </span>
+                <span v-if="scope.row.status == 2">
+                  已审核
+                </span>
+                <span v-if="scope.row.status == 3">
+                  已拒绝
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="deal" label="处理状态" width="">
+              <template slot-scope="scope">
+                <span v-if="scope.row.deal == 1">
+                  未处理
+                </span>
+                <span v-if="scope.row.deal == 2">
+                  处理中
                 </span>
-                <span v-if="scope.row.level == 2">
-                  紧急
+                <span v-if="scope.row.deal == 3">
+                  已完结
                 </span>
-                <span v-if="scope.row.level == 3">
-                  特急
+                <span v-if="scope.row.deal == 4">
+                  不予处理
                 </span>
               </template>
             </el-table-column>
@@ -125,6 +143,7 @@ export default {
         category_name: "",//导航池id
         website_name: "",//网站名称
         type_id: "",//发布类型
+        status: 2,//发布状态
 
         page: 1,//当前是第几页
         page_size: 10,//一共多少条

src/views/news/ncomplaintListApply.vue

@@ -5,19 +5,19 @@
       <div class="layerBoxLine">
         <el-row>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">投诉主题：</div>
               <el-input placeholder="请输入投诉主题" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">投诉类型：</div>
               <el-input placeholder="请输入投诉类型" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">处理状态：</div>
               <el-select v-model="getApiData.deal" placeholder="请处理状态..">
@@ -57,16 +57,33 @@
             </el-table-column>
             <el-table-column prop="type" label="接收人" width="">
             </el-table-column>
-            <el-table-column prop="level" label="处理状态" width="">
+
+            <el-table-column prop="status" label="审核状态" width="">
               <template slot-scope="scope">
-                <span v-if="scope.row.level == 1">
-                  常规
+                <span v-if="scope.row.status == 1">
+                  未审核
                 </span>
-                <span v-if="scope.row.level == 2">
-                  紧急
+                <span v-if="scope.row.status == 2">
+                  已审核
                 </span>
-                <span v-if="scope.row.level == 3">
-                  特急
+                <span v-if="scope.row.status == 3">
+                  已拒绝
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="deal" label="处理状态" width="">
+              <template slot-scope="scope">
+                <span v-if="scope.row.deal == 1">
+                  未处理
+                </span>
+                <span v-if="scope.row.deal == 2">
+                  处理中
+                </span>
+                <span v-if="scope.row.deal == 3">
+                  已完结
+                </span>
+                <span v-if="scope.row.deal == 4">
+                  不予处理
                 </span>
               </template>
             </el-table-column>
@@ -125,7 +142,7 @@ export default {
         category_name: "",//导航池id
         website_name: "",//网站名称
         type_id: "",//发布类型
-
+        status1: 1,//审核状态
         page: 1,//当前是第几页
         page_size: 10,//一共多少条
       },

src/views/news/noticeList.vue

@@ -5,13 +5,13 @@
       <div class="layerBoxLine">
         <el-row>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">标题：</div>
               <el-input placeholder="请输入标题" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">公告级别：</div>
               <el-select v-model="getApiData.level" placeholder="请选择..">

src/views/news/noticeListApply.vue

@@ -5,13 +5,13 @@
       <div class="layerBoxLine">
         <el-row>
 
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">标题：</div>
               <el-input placeholder="请输入标题" autocomplete="off" v-model="getApiData.title" />
             </div>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div class="searchBox">
               <div class="searchTitle">公告级别：</div>
               <el-select v-model="getApiData.level" placeholder="请选择..">