From 8793a3a88ebdb6910f262106f90d4b4a4523ace5 Mon Sep 17 00:00:00 2001
From: xiaweibo1 <9245255+xiaweibo1@user.noreply.gitee.com>
Date: Thu, 4 Nov 2021 10:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |   9 +-
 src/components/common/orderDialog/index.vue   |   1 -
 .../announcementConfiguration.vue             | 109 ++++++++++--------
 vue.config.js                                 |   1 +
 4 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 64ecae1..897661a 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -299,7 +299,14 @@ export const getAdminlist = query => {
         params: query
     });
 };
-
+//设置通知公告配置
+export const setNotice = query => {
+    return request({
+        url: 'api/admin.Operation/setNotice',
+        method: 'post',
+        data: query
+    });
+};
 /* 平台管理 --运营账号管理--运营角色*/
 
 //部门名称列表
diff --git a/src/components/common/orderDialog/index.vue b/src/components/common/orderDialog/index.vue
index 4bd4f47..b5f1554 100644
--- a/src/components/common/orderDialog/index.vue
+++ b/src/components/common/orderDialog/index.vue
@@ -22,7 +22,6 @@
             <el-step title="待结算" description=""></el-step>
             <el-step title="已完成" description=""></el-step>
           </template>
-          
           <template v-else>
             <el-step title="下单成功" description=""></el-step>
             <el-step title="等待付款" description=""></el-step>
diff --git a/src/components/page/OperationManagement/announcementConfiguration.vue b/src/components/page/OperationManagement/announcementConfiguration.vue
index 644f1d9..244cddf 100644
--- a/src/components/page/OperationManagement/announcementConfiguration.vue
+++ b/src/components/page/OperationManagement/announcementConfiguration.vue
@@ -11,10 +11,7 @@
         <div class="container">
             <div class="handle-box">
                 <el-input  placeholder="公告标题" class="handle-input mr10" v-model="query.title"></el-input>
-                <el-select  placeholder="发布人员" class="handle-select mr10" v-model="query.auditID">
-                    <el-option key="1" label="广东省" value="广东省"></el-option>
-                    <el-option key="2" label="湖南省" value="湖南省"></el-option>
-                </el-select>
+                <el-input  placeholder="发布人员ID" class="handle-input mr10" v-model="query.auditID"></el-input>
                 <el-date-picker
                     class="mr10"
                     v-model="query.time"
@@ -27,7 +24,8 @@
                     align="right"
                 >
                 </el-date-picker>
-                <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+                <el-button type="primary" icon="el-icon-search" @click="getData">搜索</el-button>
+                <el-button type="primary"  @click="handleEdit(0)">新增通知公告</el-button>
             </div>
             <el-table
                 :data="tableData"
@@ -35,28 +33,21 @@
                 class="table"
                 ref="multipleTable"
                 header-cell-class-name="table-header"
-                @selection-change="handleSelectionChange"
             >
                 <el-table-column prop="id" label="序号" width="55" align="center"></el-table-column>
                 <el-table-column prop="name" label="发布日期" :formatter="formatDate"></el-table-column>
                 <el-table-column label="公告标题" prop="name"></el-table-column>
-                <el-table-column prop="address" label="法人名称"></el-table-column>
-                <el-table-column label="意见内容" prop="name"></el-table-column>
-                <el-table-column label="回复人员" prop="name"></el-table-column>
+                <el-table-column label="发布人员" prop="name"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
                         <el-button
                             type="text"
-                            @click="handleEdit(scope.$index, scope.row)"
-                        >资料查看</el-button>
+                            @click="handleEdit(1, scope.row)"
+                        >公告内容</el-button>
                         <el-button
                             type="text"
                             @click="handleDelete(scope.$index, scope.row)"
-                        >查看附件</el-button>
-                        <el-button
-                            type="text"
-                            @click="handleDelete(scope.$index, scope.row)"
-                        >回复内容</el-button>
+                        >删除公告</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -73,27 +64,26 @@
         </div>
 
         <!-- 编辑弹出框 -->
-        <el-dialog title="编辑" :visible.sync="editVisible" width="30%">
-            <el-form ref="form" :model="form" label-width="70px">
-                <el-form-item label="用户名">
-                    <el-input v-model="form.name"></el-input>
+        <el-dialog title="通知公告配置" :visible.sync="editVisible" width="40%">
+            <el-form ref="form" :model="form"  :rules="rules">
+                <el-form-item label="公告标题" prop="title" class="form_item">
+                    <el-input v-model="form.title" placeholder="请输入公告标题"></el-input>
                 </el-form-item>
-                <el-form-item label="地址">
-                    <el-input v-model="form.address"></el-input>
+                <el-form-item label="公告内容" prop="content" class="form_item">
+                    <el-input v-model="form.content" type="textarea" :rows="2" placeholder="请输入公告内容"></el-input>
                 </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveEdit">确 定</el-button>
+                <el-button type="primary" @click="setNotice">确 定</el-button>
             </span>
         </el-dialog>
     </div>
 </template>
 
 <script>
-import { getNoticeList } from '../../../api/index';
+import { getNoticeList ,setNotice} from '../../../api/index';
 export default {
-    name: 'basetable',
     data() {
         return {
             query: {
@@ -103,14 +93,23 @@ export default {
                 limit: 10,
                 time:''
             },
+            noticeType:0,
+            form:{
+                id:'',
+                title:'',
+                content:''
+            },
+            rules:{
+                title: [
+                    { required: true, message: '请输入公告标题', trigger: 'blur' },
+                ],
+                content: [
+                    { required: true, message: '请输入公告内容', trigger: 'blur' },
+                ],
+            },
             tableData: [],
-            multipleSelection: [],
-            delList: [],
             editVisible: false,
             pageTotal: 0,
-            form: {},
-            idx: -1,
-            id: -1,
             pickerOptions: {
                 shortcuts: [
                     {
@@ -148,6 +147,20 @@ export default {
         this.getData();
     },
     methods: {
+        //设置通知公告配置
+        setNotice(){
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                    if (this.noticeType==0) {
+                        setNotice(this.form).then(res=>{
+                            console.info(res)
+                        })
+                    }else{
+
+                    }
+                }
+            })
+        },
         //时间戳转换时间
         formatDate(row,colnum){
             return moment(row[colnum.create_time]).format('YYYY-MM-DD HH:mm:ss')
@@ -160,11 +173,6 @@ export default {
                 this.pageTotal = res.pageTotal ;
             });
         },
-        // 触发搜索按钮
-        handleSearch() {
-            this.$set(this.query, 'pageIndex', 1);
-            this.getData();
-        },
         // 删除操作
         handleDelete(index, row) {
             // 二次确认删除
@@ -177,22 +185,15 @@ export default {
                 })
                 .catch(() => {});
         },
-        // 多选操作
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         // 编辑操作
-        handleEdit(index, row) {
-            this.idx = index;
-            this.form = row;
+        handleEdit(type,id) {
+            if (type==1) {
+                this.form.id=id
+                this.getNoticeFind()
+            }
+            this.noticeType=type
             this.editVisible = true;
         },
-        // 保存编辑
-        saveEdit() {
-            this.editVisible = false;
-            this.$message.success(`修改第 ${this.idx + 1} 行成功`);
-            this.$set(this.tableData, this.idx, this.form);
-        },
         // 分页导航
         handlePageChange(val) {
             this.$set(this.query, 'page', val);
@@ -231,4 +232,16 @@ export default {
     width: 40px;
     height: 40px;
 }
+.form_item{
+    margin-bottom: 25px;
+}
+.form_item >>>.el-input {
+    width: 80%;
+}
+.form_item >>>.el-textarea{
+    width: 80%;
+}
+.form_item >>>.el-form-item__error{
+    left: 75px;
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 9458bfe..18140a9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,6 +6,7 @@ module.exports = {
         proxy: {
             '/api':{
                 target:'http://wenhua.xingtongworld.com/',
+                // target:'http://localhost:8080',
                 changeOrigin:true,
                 pathRewrite:{
                     '/api':''