Merge remote-tracking branch 'origin/develop' into develop

src/api/process.js

@@ -731,6 +731,7 @@ export function updateMeet(data) {
   })
 }
 
+// 上传接口
 export function upFile(data) {
   return axios({
     url: '/api/att/attFile/upload',

src/pages/localTool/standCalendar/index.vue

@@ -41,10 +41,10 @@
               </div>
             </template>
           </el-calendar>
-          <!--          <div class="footer">
-                      <el-tag style="background-color: #e6a23c;color: white">当天会议</el-tag>
-                      <el-tag style="margin-left: 20px;background-color: #67c23a;color: white">我的会议</el-tag>
-                    </div>-->
+<!--          <div class="footer">
+            <el-tag style="background-color: #e6a23c;color: white">当天会议</el-tag>
+            <el-tag style="margin-left: 20px;background-color: #67c23a;color: white">我的会议</el-tag>
+          </div>-->
         </el-card>
       </el-col>
       <el-col :span="12">
@@ -81,8 +81,8 @@
               <div class="content_text">
                 <span>会议附件 :
                  <span v-if="item.files.length === 0">{{ '-' }}</span>
-                  <div v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;margin-left: 55px;margin-top: -25px;line-height: 35px" @click="previews(res.id)">
-                     <a v-if="res.name.length > 30" style="cursor: pointer">
+                  <div v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;margin-left: 58px;margin-top: -32px;line-height: 50px" @click="previews(res.id)">
+                     <a v-if="res.name.length > 30" style="cursor: pointer;margin-bottom: 5px">
                       {{ res.name.slice(0, 30) + '...' }} {{ ';' }}
                     </a>
                     <a v-else style="cursor: pointer">
@@ -508,7 +508,7 @@ export default {
       this.editMeetForm.contents
       this.editMeetForm.contents = []
       if (this.editMeetForm.content !== '') {
-          this.editMeetForm.content.split(';').forEach(item => {
+        this.editMeetForm.content.split(';').forEach(item => {
           this.editMeetForm.contents.push({
             meetingTheme: item
           })
@@ -713,13 +713,13 @@ export default {
       let contentData = []
       if (this.editMeetForm.contents.length > 0) {
         this.editMeetForm.contents.forEach(item => {
-          if (item.meetingTheme.length > 0){
+          if (item.meetingTheme.length > 0) {
             contentData.push(item.meetingTheme)
           }
         })
       }
       let editForm = {
-        attend: JSON.stringify( this.editMeetForm.attend),
+        attend: JSON.stringify(this.editMeetForm.attend),
         content: contentData.join(';'),
         id: this.editMeetForm.id,
         date: this.editMeetForm.date,
@@ -729,7 +729,7 @@ export default {
         place: this.editMeetForm.place
       }
       this.loading = true
-      updateMeet(editForm).then(res=>{
+      updateMeet(editForm).then(res => {
         if (true) {
           this.$message.success("编辑成功");
           this.meetFlag = false

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -375,6 +375,7 @@
         drag
         :file-list="rh_pageData.infoSources"
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
         :on-success="handleOnsuccess"
@@ -426,7 +427,7 @@ import {
   startProcess, saveTaskFirst,
   completeTask, queryTaskFirst,
   taskDel, workGroup, processBack,
-  getBusStandFileByAttId
+  getBusStandFileByAttId,upFile
 } from '@/api/process.js'
 
 export default {
@@ -620,6 +621,20 @@ export default {
         }
       })
     },
+    httpRequest(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append("file", file)
+      upFile(form).then(res=>{
+        if (res.ok) {
+          this.handleOnsuccess(res)
+        } else {
+          this.$message.warning('上传失败')
+        }
+      })
+    },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {

src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue

@@ -128,6 +128,7 @@
                 name="file"
                 :file-list="upOtherData"
                 accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+                :http-request="httpRequestOther"
                 :before-upload="beforeUploadOther"
                 :before-remove="beforeRemoveOther"
                 :on-success="onsuccessOther"
@@ -203,6 +204,7 @@
         name="file"
         :file-list="reData"
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        :http-request="httpRequest"
         :before-upload="handleBeforeUpload"
         :before-remove="handleBeforeRemove"
         :on-success="handleOnsuccess"
@@ -224,6 +226,7 @@
         name="file"
         :file-list="themeData"
         accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
+        :http-request="httpRequestTheme"
         :before-upload="beforeUploadTheme"
         :before-remove="beforeRemoveTheme"
         :on-success="onsuccessTheme"
@@ -239,7 +242,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst, completeTask, inboundLiaisonDetail} from '@/api/process.js'
+import { saveTaskFirst, completeTask, inboundLiaisonDetail,upFile} from '@/api/process.js'
 
 export default {
   components: {
@@ -386,6 +389,20 @@ export default {
       this.reData = this.fileListData.material
       this.upDialog = true
     },
+    httpRequest(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append("file", file)
+      upFile(form).then(res=>{
+        if (res.ok) {
+          this.handleOnsuccess(res)
+        } else {
+          this.$message.warning('上传失败')
+        }
+      })
+    },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {
@@ -460,6 +477,20 @@ export default {
       this.upThemeDialog = true
 
     },
+    httpRequestTheme(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append("file", file)
+      upFile(form).then(res=>{
+        if (res.ok) {
+          this.onsuccessTheme(res)
+        } else {
+          this.$message.warning('上传失败')
+        }
+      })
+    },
     // 文件上传成功
     onsuccessTheme(res, file, fileList) {
       if (res.ok) {
@@ -521,6 +552,21 @@ export default {
     },
 
     /** 其他资料上传 */
+
+    httpRequestOther(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append("file", file)
+      upFile(form).then(res=>{
+        if (res.ok) {
+          this.onsuccessOther(res)
+        } else {
+          this.$message.warning('上传失败')
+        }
+      })
+    },
     // 文件上传成功
     onsuccessOther(res, file, fileList) {
       if (res.ok) {

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -51,6 +51,7 @@
                   name="file"
                   :file-list="fileTextList"
                   accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+                  :http-request="httpRequest"
                   :before-upload="handleBeforeUpload"
                   :before-remove="handleBeforeRemove"
                   :on-remove="handleONRemove"
@@ -178,7 +179,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask} from "@/api/process"
+import {inboundLiaisonDetail, completeTask, saveTaskForPub, changeAssigneeNew,execTask,upFile} from "@/api/process"
 
 export default {
   name: "wfhxzgStep4",
@@ -298,6 +299,20 @@ export default {
     uploadFile (val) {
       this.fileListData = val
     },
+    httpRequest(params) {
+      const file = params.file
+      // 根据后台需求数据格式
+      const form = new FormData()
+      // 文件对象
+      form.append("file", file)
+      upFile(form).then(res=>{
+        if (res.ok) {
+          this.handleOnsuccess(res)
+        } else {
+          this.$message.warning('上传失败')
+        }
+      })
+    },
     // 文件上传成功
     handleOnsuccess(res, file, fileList) {
       if (res.ok) {