Browse Source

通告管理页面新增服务修改为新增各项参数服务和新增附件服务;

SunZehao 1 year ago
parent
commit
133e872227

+ 7 - 2
src/api/api.js

@@ -198,9 +198,14 @@ export function apiGetevaluationdeptnoticeList(params) {
     })
 }
 //----"通告管理-保存or修改"
-export function apiGetevaluationdeptnoticeSave(params, datas) {
+export function apiGetevaluationdeptnoticeSave(params) {
+    return httpRequest.post('evaluation-dept-notice/save', params)
+}
+//----"通告管理-保存or修改"
+export function apiGetuploadAttachment(params, datas) {
     return httpRequest({
-        url: `evaluation-dept-notice/save?id=${params.id?params.id: ''}&noticeTitle=${params.noticeTitle}&noticeContent=${params.noticeContent}&sendTo=${params.sendTo}&sendToContent=${params.sendToContent}&releaseState=${params.releaseState}&releaseDept=${params.releaseDept}&releaseDeptName=${params.releaseDeptName}&releasePeople=${params.releasePeople}&releasePeopleName=${params.releasePeopleName}&serialNumber=${params.serialNumber}`,
+        // url: `evaluation-dept-notice/save?id=${params.id?params.id: ''}&noticeTitle=${params.noticeTitle}&noticeContent=${params.noticeContent}&sendTo=${params.sendTo}&sendToContent=${params.sendToContent}&releaseState=${params.releaseState}&releaseDept=${params.releaseDept}&releaseDeptName=${params.releaseDeptName}&releasePeople=${params.releasePeople}&releasePeopleName=${params.releasePeopleName}&serialNumber=${params.serialNumber}`,
+        url: `evaluation-dept-notice/uploadAttachment?id=${params.id?params.id: ''}`,
         method: 'post',
         header: { 'Content-Type': 'multipart/form-data' },
         mimeType: 'multipart/form-data',

+ 1 - 1
src/components/gatewaynNewPage.vue

@@ -374,7 +374,7 @@
         },
         mounted() {
             this.getYearSeasonData()
-            // this.getDeptNoticeData()
+            this.getDeptNoticeData()
         },
         methods: {
             // 获取首页年份和季度数据

+ 43 - 25
src/components/notification/notificationMangePage.vue

@@ -173,7 +173,8 @@
                                             <img :src="file" style="margin-right: 10px" >
                                             <span class="fliesMainSpan spanOne">{{it.name}}</span>
                                         </div>
-                                        <span class="fliesMainSpan spanTwo">{{userMes.unitName}}</span>
+                                        <!-- <span class="fliesMainSpan spanTwo">{{userMes.unitName}}</span> -->
+                                        <span class="fliesMainSpan spanTwo">测试</span>
                                         <div class="removeDiv">
                                             <!-- <div @click="previewFile(it)" style="cursor:pointer">
                                                 <img :src="yulan" style="margin-right: 10px;" >
@@ -195,7 +196,6 @@
                                             <span class="fliesMainSpan spanOne">{{it.name}}</span>
                                         </div>
                                         <span class="fliesMainSpan spanTwo">{{it.releaseDeptName}}</span>
-                                        <!-- <span>{{userMes.unitName}}</span> -->
                                         <div class="removeDiv">
                                             <!-- <div @click="previewFile(it)" style="cursor:pointer">
                                                 <img :src="yulan" style="margin-right: 10px;" >
@@ -215,7 +215,6 @@
                                             <span class="fliesMainSpan spanOne">{{it}}</span>
                                         </div>
                                         <span class="fliesMainSpan spanTwo">{{it.releaseDeptName}}</span>
-                                        <!-- <span>{{userMes.unitName}}</span> -->
                                         <div class="fileOperate">
                                             <div @click="previewFile(it)" style="cursor:pointer">
                                                 <img :src="yulan" style="margin-right: 10px;" >
@@ -267,7 +266,7 @@ import yulan from '../../assets/btnIcon/yulan.png'
 import fileDelete from '../../assets/btnIcon/fileDelete.png'
 import draft from '../../assets/btnIcon/draft.png'
 import release from '../../assets/btnIcon/release.png'
-import {apiGetevaluationdeptnoticeList, apiGetevaluationdeptnoticeSave,apievaluationdeptnoticeDelete,
+import {apiGetevaluationdeptnoticeList, apiGetevaluationdeptnoticeSave,apievaluationdeptnoticeDelete,apiGetuploadAttachment,
 apiGetorganizationstructureFromTree, apiPostevaluationdeptnoticeDelete, apiPostevaluationdeptnoticeModifiedState,
 apiGetevaluationdeptnoticeFilePreview} from '../../api/api'
 export default {
@@ -338,7 +337,7 @@ export default {
         }
     },
     created() {
-        this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
+        // this.userMes = JSON.parse(window.sessionStorage.getItem('user'))
         this.sendToData = [
             {
                 label: '所有单位',
@@ -457,37 +456,56 @@ export default {
                 releasePeople: that.userMes.id,
                 releasePeopleName: that.userMes.name
             }
-            const formData = new FormData()
-            if (that.filesList.length>0) {
-                that.filesList.forEach(item =>{
-                    formData.append('files', item.raw)
-                })
-            }
             if (that.isSave) {
                 params.id = that.evalradio.id
             }
-            formData.append('deptNames', 'deptNames')
-            apiGetevaluationdeptnoticeSave(params, formData).then(datas =>{
+            // formData.append('deptNames', 'deptNames')
+            apiGetevaluationdeptnoticeSave(params).then(datas =>{
                 if (!datas.success) {
                     that.$message({
                         message: datas.message,
                         type: 'error'
                     });
                 } else {
-                    if (!that.isSave) {
-                        that.$message({
-                            message: '通告新增成功',
-                            type: 'success'
-                        });
+                    const formData = new FormData()
+                    if (that.filesList.length>0) {
+                        that.filesList.forEach(item =>{
+                            formData.append('files', item.raw)
+                        })
+                        apiGetuploadAttachment({id: datas.data}, formData).then(request =>{
+                            if (request.success) {
+                                if (!that.isSave) {
+                                    that.$message({
+                                        message: '通告新增成功',
+                                        type: 'success'
+                                    });
+                                } else {
+                                    that.$message({
+                                        message: '通告修改成功',
+                                        type: 'success'
+                                    });
+                                }
+                                that.dialogVisible = false
+                                that.changeDateSelect = []
+                                that.getevalunotificationList()
+                            }
+                        })
                     } else {
-                        that.$message({
-                            message: '通告修改成功',
-                            type: 'success'
-                        });
+                        if (!that.isSave) {
+                            that.$message({
+                                message: '通告新增成功',
+                                type: 'success'
+                            });
+                        } else {
+                            that.$message({
+                                message: '通告修改成功',
+                                type: 'success'
+                            });
+                        }
+                        that.dialogVisible = false
+                        that.changeDateSelect = []
+                        that.getevalunotificationList()
                     }
-                    that.dialogVisible = false
-                    that.changeDateSelect = []
-                    that.getevalunotificationList()
                 }
             })
         },