会议申报修改

src/components/meetingDeclarationUpload.vue

@@ -0,0 +1,225 @@
+<template>
+    <div v-loading="loading">
+        <el-upload class="upload-demo" :drag="fileInfo.type !== 'btn'" multiple :limit="fileInfo.limit" ref="upload"
+            action="string" :on-remove="handleRemove" :on-exceed="handleExceed" :file-list="fileList"
+             :auto-upload="true" :show-file-list="fileInfo.type !== 'btn'"
+            :before-upload="deforeUp" :http-request="signUpload">
+            <div v-if="fileInfo.type !== 'btn'">
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">点击上传</div>
+            </div>
+            <div v-if="fileInfo.type === 'btn'">
+                <el-button :size="fileInfo.size?fileInfo.size:'medium'" :type="fileInfo.btntype">{{fileInfo.typename}}</el-button>
+            </div>
+        </el-upload>
+    </div>
+</template>
+<script>
+    export default {
+        props: ['fileInfo', 'fileList'],
+        data() {
+            return {
+                fileLists: [],
+                attList: [],
+                loading: false,
+                num: 0,
+                s: false
+            }
+        },
+        methods: {
+            signUpload(){},
+            //删除
+            handleRemove(file) {
+                for (let i = 0; i < this.attList.length; i++) {
+                    if (this.attList[i].fileName === file.name) {
+                        this.attList.splice(i, 1);
+                        this.$emit('uploadBack', this.attList)
+                    }
+                }
+            },
+            //数量限制
+            handleExceed(files, fileList) {
+                this.$message.warning(
+                    `当前限制选择 ${this.fileInfo.limit} 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`
+                );
+            },
+            deforeUp(file) {
+                const isLt2M = file.size / 1024 / 1024 < 100;
+                if (!isLt2M) {
+                    this.$message.error('上传文件大小不能超过 20MB!');
+                    return false
+                }
+                
+                if(this.fileInfo.type == 'img'){
+                    const isImg = file.type.split("/")[0] == 'image';
+                    if (!isImg) {
+                        this.$message.error('请上传图片格式文件!');
+                        return false
+                    }
+                }
+                if(this.fileInfo.typexz == 'ppt'){
+                    const isImg = file.name.split(".")[1] == 'pptx';
+                    console.log(file.name.split(".")[1] == 'pptx')
+                    if (!isImg) {
+                        this.$message.error('请上传ppt格式文件!');
+                        return false
+                    }
+                }
+                if(this.fileInfo.typexz == 'csv'){
+                    const isImg = file.name.split(".")[1] == 'csv';
+                    if (!isImg) {
+                        this.$message.error('请上传csv格式文件!');
+                        return false
+                    }
+                }
+                if(this.fileInfo.typexz == 'xlsx'){
+                    const isImg = file.name.split(".")[1] == 'xlsx';
+                    if (!isImg) {
+                        this.$message.error('请上传xlsx格式文件!');
+                        return false
+                    }
+                }
+
+                
+                for(var i=0;i<this.attList.length;i++)
+                
+                {
+                     if(this.attList[i].fileName == file.name){
+                        this.$message.error('文件名重复,请修改文件名后,再上传!');
+                        this.attList.push(this.attList[i])
+                        return false
+                    }
+                }
+                this.loading = true;
+                let query = new FormData();
+                query.append("file", file);
+                if(this.fileInfo.typename == '新增素材'){
+                    query.append("advType", this.fileInfo.advType);
+                    query.append("advTypeName", this.fileInfo.advTypeName);
+                }
+                if(this.fileInfo.url == '/market/cIllegalCallTask/importTempByProv'||this.fileInfo.url == '/market/cChannelInfo/cIllegalCallTask/importTempByProv'){
+                    query.append("taskId", this.fileInfo.taskId);
+                    query.append("tempId", this.fileInfo.tempId);
+                }
+                //违规外呼
+                if(this.fileInfo.uploadType == 'outCall'){
+                    query.append("uploadType", 'outCall');
+                    query.append("relId", this.fileInfo.relId);
+                }
+                if(this.fileInfo.uploadType == 'train'){
+                    query.append("uploadType", 'train');
+                    query.append("relId", this.fileInfo.relId);
+                }
+                //运营类项目考核及结算
+                if(this.fileInfo.url == '/market/cmkAttachInfo/upload'){
+                    query.append("uploadType", this.fileInfo.uploadType);
+                }
+                if(this.fileInfo.url == '/market/cStoreOutWo/importData'){
+                    query.append("woNo", this.fileInfo.woNo);
+                }
+                if(this.fileInfo.url == '/market/cStoreScheTrainEva/importDataEva'){
+                    query.append("evaId", this.fileInfo.evaId);
+                }
+                this.num++;
+                let _this = this;
+                
+                this.$http({
+                    url: this.fileInfo.url,
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: query,
+                }).then((res) => {
+
+                    if (this.fileInfo.type === 'btn') {
+                        this.$refs['upload'].clearFiles();
+                        this.$emit('uploadBack',res)
+                        _this.$message({
+                            message: res.data.desc,
+                            type: 'success'
+                        });
+                        this.num--;
+                        if (this.num == 0) {
+                            this.loading = false;
+                        }
+                        return
+                    }
+                    if (this.fileInfo.type === 'voice') {
+                        this.attList = res.data;
+                    } else {
+                        this.attList.push({
+                            id: res.data.body.id,
+                            fileName: res.data.body.fileName,
+                            fileCode: res.data.body.fileCode,
+                            opName: res.data.body.opName,
+                            opNo: res.data.body.opNo,
+                            opTime: res.data.body.opTime,
+                            attchFileId: res.data.body.attchFileId,
+                            type: res.data.body.type,
+                        });
+                    }
+                    this.$emit('uploadBack', this.attList);
+                    this.num--;
+                    if (this.num == 0) {
+                        this.loading = false;
+                    }
+                    return true
+                }).catch((res) => {
+                    this.$message({
+                        message: file.name+'上传失败',
+                        type: 'error'
+                    });
+                    this.num--;
+                    if (this.num == 0) {
+                        this.loading = false;
+                    }
+                    for (let i = 0; i < this.$refs['upload'].uploadFiles.length; i++) {
+                        if(file.name == this.$refs['upload'].uploadFiles[i].name){
+                            this.$refs['upload'].uploadFiles.splice(i,1)
+                        }
+                    }
+                    return false
+                })
+            },
+        },
+        mounted() {
+
+        },
+        created() {
+            this.attList = [];
+            for (let i = 0; i < this.fileList.length; i++) {
+                this.attList.push({
+                    id: this.fileList[i].id,
+                    fileName: this.fileList[i].fileName,
+                    fileCode: this.fileList[i].fileCode,
+                    opName: this.fileList[i].opName,
+                    opNo: this.fileList[i].opNo,
+                    opTime: this.fileList[i].opTime,
+                    attchFileId: this.fileList[i].attchFileId,
+                    type: this.fileList[i].type,
+                })
+            }
+        },
+        watch: {
+            fileList() {
+                this.attList = [];
+                for (let i = 0; i < this.fileList.length; i++) {
+                    this.attList.push({
+                        id: this.fileList[i].id,
+                        fileName: this.fileList[i].fileName,
+                        fileCode: this.fileList[i].fileCode,
+                        opName: this.fileList[i].opName,
+                        opNo: this.fileList[i].opNo,
+                        opTime: this.fileList[i].opTime,
+                        attchFileId: this.fileList[i].attchFileId,
+                        type: this.fileList[i].type,
+                    })
+                }
+            }
+        }
+    }
+</script>
+<style scoped lang="scss">
+
+</style>

src/pages/main/meetingDeclaration/marketDecisionMeeting.vue

@@ -100,6 +100,7 @@
                     border
                     size="mini"
                     style="margin: 20px 0;"
+                    height="50vh"
                 >
                     <el-table-column prop="serialNumber" label="序号">
                     </el-table-column>
@@ -135,12 +136,14 @@
                                 size="mini"
                                 type="primary"
                                 @click="jump(3, scope.row)"
+                                v-if="scope.row.opNo == loginNoStr"
                                 >编辑</el-button
                             >
                             <el-button
                                 size="mini"
                                 type="primary"
                                 @click="jump(4, scope.row)"
+                                v-if="scope.row.opNo == loginNoStr"
                                 >删除</el-button
                             >
                         </template>
@@ -148,7 +151,7 @@
                 </el-table>
 
                 <div slot="footer" class="dialog-footer myfooter">
-                    <el-button type="primary" @click="dialogCli(1)"
+                    <el-button type="primary" @click="dialogCli(1)" v-if="isAllExport"
                         >全量导出</el-button
                     >
                     <el-button type="primary" @click="closedia">确定</el-button>
@@ -177,6 +180,19 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item prop="dept">
+                            <span>申报部门</span>
+                            <el-input v-model="infolist.dept"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="topicsName">
+                            <span>议题名称</span>
+                            <el-input v-model="infolist.topicsName"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="department">
+                            <span>申报科室</span>
+                            <el-input v-model="infolist.department"></el-input>
+                        </el-form-item>
+                        
                         <el-form-item prop="topicsType">
                             <span>线条</span>
                             <el-select
@@ -193,18 +209,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="topicsName">
-                            <span>议题名称</span>
-                            <el-input v-model="infolist.topicsName"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="department">
-                            <span>申报科室</span>
-                            <el-input v-model="infolist.department"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="dept">
-                            <span>申报部门</span>
-                            <el-input v-model="infolist.dept"></el-input>
-                        </el-form-item>
                         <el-form-item prop="declarant">
                             <span>申报姓名</span>
                             <el-input v-model="infolist.declarant"></el-input>
@@ -241,12 +245,12 @@
                             <span>附件</span>
                             <div class="upload-box">
                                 <div>
-                                    <myUpload
+                                    <myMeetingUpload
                                         @uploadBack="uploadBack"
                                         :fileInfo="fileInfo"
                                         :fileList="fileInfo.fileList"
                                     >
-                                    </myUpload>
+                                    </myMeetingUpload>
                                 </div>
                             </div>
                         </el-form-item>
@@ -285,6 +289,23 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item prop="dept">
+                            <span>申报部门</span>
+                            <el-input v-model="editInfolist.dept"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="topicsName">
+                            <span>议题名称</span>
+                            <el-input
+                                v-model="editInfolist.topicsName"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item prop="department">
+                            <span>申报科室</span>
+                            <el-input
+                                v-model="editInfolist.department"
+                            ></el-input>
+                        </el-form-item>
+                        
                         <el-form-item prop="topicsType">
                             <span>线条</span>
                             <el-select
@@ -301,22 +322,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="topicsName">
-                            <span>议题名称</span>
-                            <el-input
-                                v-model="editInfolist.topicsName"
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item prop="department">
-                            <span>申报科室</span>
-                            <el-input
-                                v-model="editInfolist.department"
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item prop="dept">
-                            <span>申报部门</span>
-                            <el-input v-model="editInfolist.dept"></el-input>
-                        </el-form-item>
                         <el-form-item prop="declarant">
                             <span>申报姓名</span>
                             <el-input
@@ -355,12 +360,12 @@
                             <span>附件</span>
                             <div class="upload-box">
                                 <div>
-                                    <myUpload
+                                    <myMeetingUpload
                                         @uploadBack="uploadBack"
                                         :fileInfo="fileInfo"
                                         :fileList="fileInfo.fileList"
                                     >
-                                    </myUpload>
+                                    </myMeetingUpload>
                                 </div>
                             </div>
                         </el-form-item>
@@ -387,14 +392,16 @@
 // import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
-import myUpload from "../../../components/upload";
+// import myUpload from "../../../components/upload";
+import myMeetingUpload from "../../../components/meetingDeclarationUpload";
 
 export default {
     components: {
         // mySearch,
         myMessage,
         toolList,
-        myUpload
+        // myUpload,
+        myMeetingUpload
     },
     data() {
         const reporting = (rule, value, callback) => {
@@ -527,6 +534,7 @@ export default {
             year: this.$formatDate(new Date().getTime(), "YYYY"),
             month: "",
             mId: "",
+            mName:"",
             personInfo: [],
             monthOpt: [
                 "01",
@@ -542,7 +550,8 @@ export default {
                 "11",
                 "12"
             ],
-            menus: JSON.parse(window.sessionStorage.childrenMenus)
+            menus: JSON.parse(window.sessionStorage.childrenMenus),
+            isAllExport: false
         };
     },
     methods: {
@@ -554,6 +563,7 @@ export default {
 
                 this.getInfo(n.id);
                 this.mId = n.id;
+                this.mName = n.meetingName;
             } else if (v === 2) {
                 this.titname = "上传";
                 this.uploadDialogStatus = true;
@@ -612,7 +622,6 @@ export default {
                 });
 
 
-                // console.log(this.editInfolist);
             } else if (v === 4) {
                 this.loadinged = true;
                 this.$http({
@@ -639,7 +648,7 @@ export default {
         getInfo(n) {
             this.$http({
                 url:
-                    "market/cMeetingDeclaration/queryMkMeetingDeclarationInfoList",
+                    "/market/cMeetingDeclaration/queryMkMeetingDeclarationInfoList",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json"
@@ -656,6 +665,7 @@ export default {
         },
         editClosedia() {
             this.editDialogStatus = false;
+            this.fileInfo.fileList = []
         },
         //搜索数据
         searchInfo() {
@@ -675,7 +685,7 @@ export default {
                       this.month)
                 : "";
 
-            this.getList(this.params, this.pageSize);
+            this.getList(this.params, 1);
         },
         //获取列表
         getList(v, n) {
@@ -724,7 +734,7 @@ export default {
                         window.navigator.msSaveOrOpenBlob(
                             blob,
                             // this.wo.bizName + ".xlsx"
-                            "导出" + ".zip"
+                            this.mName + ".zip"
                         );
                     } else {
                         /* 火狐谷歌的文件下载方式 */
@@ -732,7 +742,7 @@ export default {
                         var downloadElement = document.createElement("a");
                         var href = window.URL.createObjectURL(blob);
                         downloadElement.href = href;
-                        downloadElement.download = "导出" + ".zip";
+                        downloadElement.download = this.mName + ".zip";
                         document.body.appendChild(downloadElement);
                         downloadElement.click();
                         document.body.removeChild(downloadElement);
@@ -757,7 +767,7 @@ export default {
                         this.infolist.attList = this.fileList;
 
                         this.submitInfo(
-                            "market/cMeetingDeclaration/addInfo",
+                            "/market/cMeetingDeclaration/addInfo",
                             this.infolist
                         );
                     }
@@ -802,7 +812,7 @@ export default {
                     });
                     _this.infolist = {};
                     _this.dialogStatus = false;
-                    _this.getList({}, _this.pageSize);
+                    _this.getList(_this.params, _this.pageSize);
                     _this.uploadDialogStatus = false;
                     _this.editDialogStatus = false;
                     _this.attList = [];
@@ -855,9 +865,7 @@ export default {
         },
         //文件返回值
         uploadBack(v) {
-           // this.fileInfo.fileList=v;
             this.attList = v;
-            // console.log(v);
         },
         //功能栏
         iconCli(v) {
@@ -878,6 +886,13 @@ export default {
     mounted() {
         this.getList({}, 1);
         this.getUser();
+        this.menus.forEach(item=>{
+            if(item.jspUrl == '/allExport'){
+                this.isAllExport = true
+			}else{
+                this.isAllExport = false
+            }
+        })
     },
     created() {}
 };
@@ -938,11 +953,12 @@ export default {
 }
 .info-line2 {
     width: 100%;
-    padding-left: 40px;
+    padding-left: 20px;
 
     .upload-box {
         width: calc(100% - 80px);
         display: inline-block;
+        padding-left: 20px;
     }
     span {
         width: 60px;
@@ -959,6 +975,7 @@ export default {
     .remark-box::v-deep {
         width: calc(100% - 80px);
         display: inline-block;
+        padding-left: 20px;
         div {
             padding-bottom: 10px;
         }

src/pages/main/meetingDeclaration/specialReport.vue

@@ -94,6 +94,7 @@
             :close-on-click-modal="false"
             :before-close="closedia"
             :fullscreen="false"
+            
         >
             <div v-loading="loadinged">
                 <el-table
@@ -101,6 +102,7 @@
                     border
                     size="mini"
                     style="margin: 20px 0;"
+                    height="50vh"
                 >
                     <el-table-column prop="serialNumber" label="序号">
                     </el-table-column>
@@ -131,17 +133,20 @@
                         align="center"
                         fixed="right"
                     >
+                        
                         <template slot-scope="scope">
                             <el-button
                                 size="mini"
                                 type="primary"
                                 @click="jump(3, scope.row)"
+                                v-if="scope.row.opNo == loginNoStr"
                                 >编辑</el-button
                             >
                             <el-button
                                 size="mini"
                                 type="primary"
                                 @click="jump(4, scope.row)"
+                                v-if="scope.row.opNo == loginNoStr"
                                 >删除</el-button
                             >
                         </template>
@@ -149,7 +154,7 @@
                 </el-table>
 
                 <div slot="footer" class="dialog-footer myfooter">
-                    <el-button type="primary" @click="dialogCli(1)"
+                    <el-button type="primary" @click="dialogCli(1)" v-if="isAllExport"
                         >全量导出</el-button
                     >
                     <el-button type="primary" @click="closedia">确定</el-button>
@@ -178,6 +183,19 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item prop="dept">
+                            <span>申报部门</span>
+                            <el-input v-model="infolist.dept"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="topicsName">
+                            <span>议题名称</span>
+                            <el-input v-model="infolist.topicsName"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="department">
+                            <span>申报科室</span>
+                            <el-input v-model="infolist.department"></el-input>
+                        </el-form-item>
+                        
                         <el-form-item prop="topicsType">
                             <span>线条</span>
                             <el-select
@@ -194,18 +212,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="topicsName">
-                            <span>议题名称</span>
-                            <el-input v-model="infolist.topicsName"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="department">
-                            <span>申报科室</span>
-                            <el-input v-model="infolist.department"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="dept">
-                            <span>申报部门</span>
-                            <el-input v-model="infolist.dept"></el-input>
-                        </el-form-item>
                         <el-form-item prop="declarant">
                             <span>申报姓名</span>
                             <el-input v-model="infolist.declarant"></el-input>
@@ -242,12 +248,12 @@
                             <span>附件</span>
                             <div class="upload-box">
                                 <div>
-                                    <myUpload
+                                    <myMeetingUpload
                                         @uploadBack="uploadBack"
                                         :fileInfo="fileInfo"
                                         :fileList="fileInfo.fileList"
                                     >
-                                    </myUpload>
+                                    </myMeetingUpload>
                                 </div>
                             </div>
                         </el-form-item>
@@ -286,6 +292,23 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item prop="dept">
+                            <span>申报部门</span>
+                            <el-input v-model="editInfolist.dept"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="topicsName">
+                            <span>议题名称</span>
+                            <el-input
+                                v-model="editInfolist.topicsName"
+                            ></el-input>
+                        </el-form-item>
+                        <el-form-item prop="department">
+                            <span>申报科室</span>
+                            <el-input
+                                v-model="editInfolist.department"
+                            ></el-input>
+                        </el-form-item>
+                        
                         <el-form-item prop="topicsType">
                             <span>线条</span>
                             <el-select
@@ -302,22 +325,6 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="topicsName">
-                            <span>议题名称</span>
-                            <el-input
-                                v-model="editInfolist.topicsName"
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item prop="department">
-                            <span>申报科室</span>
-                            <el-input
-                                v-model="editInfolist.department"
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item prop="dept">
-                            <span>申报部门</span>
-                            <el-input v-model="editInfolist.dept"></el-input>
-                        </el-form-item>
                         <el-form-item prop="declarant">
                             <span>申报姓名</span>
                             <el-input
@@ -356,12 +363,12 @@
                             <span>附件</span>
                             <div class="upload-box">
                                 <div>
-                                    <myUpload
+                                    <myMeetingUpload
                                         @uploadBack="uploadBack"
                                         :fileInfo="fileInfo"
                                         :fileList="fileInfo.fileList"
                                     >
-                                    </myUpload>
+                                    </myMeetingUpload>
                                 </div>
                             </div>
                         </el-form-item>
@@ -388,14 +395,14 @@
 // import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
-import myUpload from "../../../components/upload";
+import myMeetingUpload from "../../../components/meetingDeclarationUpload";
 
 export default {
     components: {
         // mySearch,
         myMessage,
         toolList,
-        myUpload
+        myMeetingUpload
     },
     data() {
         // const reporting = (rule, value, callback) => {
@@ -528,6 +535,7 @@ export default {
             year: this.$formatDate(new Date().getTime(), "YYYY"),
             month: "",
             mId: "",
+            mName:"",
             personInfo: [],
             monthOpt: [
                 "01",
@@ -543,7 +551,8 @@ export default {
                 "11",
                 "12"
             ],
-            menus: JSON.parse(window.sessionStorage.childrenMenus)
+            menus: JSON.parse(window.sessionStorage.childrenMenus),
+            isAllExport: false
         };
     },
     methods: {
@@ -555,6 +564,7 @@ export default {
 
                 this.getInfo(n.id);
                 this.mId = n.id;
+                this.mName = n.meetingName;
             } else if (v === 2) {
                 this.titname = "上传";
                 this.uploadDialogStatus = true;
@@ -610,10 +620,11 @@ export default {
                         opNo: item.opNo,
                         opTime: item.opTime,
                     });
+
+                    
                 });
 
 
-                // console.log(this.editInfolist);
             } else if (v === 4) {
                 this.loadinged = true;
                 this.$http({
@@ -640,7 +651,7 @@ export default {
         getInfo(n) {
             this.$http({
                 url:
-                    "market/cMeetingDeclaration/queryMkMeetingDeclarationInfoList",
+                    "/market/cMeetingDeclaration/queryMkMeetingDeclarationInfoList",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json"
@@ -657,6 +668,7 @@ export default {
         },
         editClosedia() {
             this.editDialogStatus = false;
+            this.fileInfo.fileList = []
         },
         //搜索数据
         searchInfo() {
@@ -675,8 +687,7 @@ export default {
                       "-" +
                       this.month)
                 : "";
-
-            this.getList(this.params, this.pageSize);
+            this.getList(this.params, 1);
         },
         //获取列表
         getList(v, n) {
@@ -725,7 +736,7 @@ export default {
                         window.navigator.msSaveOrOpenBlob(
                             blob,
                             // this.wo.bizName + ".xlsx"
-                            "导出" + ".zip"
+                            this.mName + ".zip"
                         );
                     } else {
                         /* 火狐谷歌的文件下载方式 */
@@ -733,7 +744,7 @@ export default {
                         var downloadElement = document.createElement("a");
                         var href = window.URL.createObjectURL(blob);
                         downloadElement.href = href;
-                        downloadElement.download = "导出" + ".zip";
+                        downloadElement.download = this.mName + ".zip";
                         document.body.appendChild(downloadElement);
                         downloadElement.click();
                         document.body.removeChild(downloadElement);
@@ -758,7 +769,7 @@ export default {
                         this.infolist.attList = this.fileList;
 
                         this.submitInfo(
-                            "market/cMeetingDeclaration/addInfo",
+                            "/market/cMeetingDeclaration/addInfo",
                             this.infolist
                         );
                     }
@@ -803,7 +814,7 @@ export default {
                     });
                     _this.infolist = {};
                     _this.dialogStatus = false;
-                    _this.getList({}, _this.pageSize);
+                    _this.getList(_this.params, _this.pageSize);
                     _this.uploadDialogStatus = false;
                     _this.editDialogStatus = false;
                     _this.attList = [];
@@ -856,9 +867,7 @@ export default {
         },
         //文件返回值
         uploadBack(v) {
-           // this.fileInfo.fileList=v;
             this.attList = v;
-            // console.log(v);
         },
         //功能栏
         iconCli(v) {
@@ -872,13 +881,20 @@ export default {
         getUser() {
             this.userInfo = JSON.parse(window.sessionStorage.userInfo);
             this.loginNoStr = this.userInfo.loginNoStr;
-
             this.personInfo = this.userInfo.groupName.split("/");
         }
     },
     mounted() {
         this.getList({}, 1);
         this.getUser();
+
+        this.menus.forEach(item=>{
+            if(item.jspUrl == '/allExport'){
+                this.isAllExport = true
+			}else{
+                this.isAllExport = false
+            }
+        })
     },
     created() {}
 };
@@ -939,11 +955,13 @@ export default {
 }
 .info-line2 {
     width: 100%;
-    padding-left: 40px;
+    padding-left: 20px;
+    
 
     .upload-box {
         width: calc(100% - 80px);
         display: inline-block;
+        padding-left: 20px;
     }
     span {
         width: 60px;
@@ -960,6 +978,7 @@ export default {
     .remark-box::v-deep {
         width: calc(100% - 80px);
         display: inline-block;
+        padding-left: 20px;
         div {
             padding-bottom: 10px;
         }