Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!17

src/components/uploadFile.vue

@@ -26,7 +26,7 @@
         <el-col :span="span" v-for="(item,i) in lists" :key="i">
           <div class="el-col-ctn-box "
                @click="handlePreview(item)">
-            <div class="el-col-upload-box">
+            <div class="el-col-upload-box mb-8">
               <div class="upload-preview-box">
                 <img v-if="item.deletable && !readOnly"
                      class="upload-delete-icon" src="../assets/image/icon_close.png" alt=""
@@ -184,6 +184,7 @@
   
     methods: {
       async formatFileList() {
+        // console.log(this.fileList,'formatFileList')
         let fileList = this.fileList || []
         fileList = JSON.parse(JSON.stringify(fileList))
         // console.log('upload===========formatFileList()方法==========fileList：', fileList)
@@ -214,6 +215,7 @@
         //     return obj
         // });
         // this.lists = lists
+        this.testList = []
         await this.getpreviewfull()
         this.lists = this.testList
         // console.log('uploadFile----:', this.lists)
@@ -245,7 +247,7 @@
         }
       },
       async httpRequest(param) {
-        console.log(this.accept,'httpRequest上传文件：', param)
+        // console.log(this.accept,'httpRequest上传文件：', param)
         let fileType = this.$util.getFileExtension(param.file.name)
         // 上传图片类型:png,jpg,bmp
         if (this.accept !== '*' && this.accept.indexOf(fileType) === -1) {

src/pages/case-mistake/index.vue

@@ -204,6 +204,7 @@ import cpkapi from "@/services/casePackageManagement";
                 }).then(() => {
                     if(!this.$clickThrottle()) { return }//防止重复点击
                     cpkapi.postcase_pkg_error_clean({ id: this.queryParam.id }).then((res) => {
+                        this.tableData=[]
                         this.$message.success("清空此案件包错误案件成功");
                         this.getCasepkgList()
                        

src/pages/event-tracing/components/CallDialog.vue

@@ -188,7 +188,7 @@ import { size } from "lodash";
             },
             // 进入队列
             handleEnterqueue(row){
-                this.$router.push({path: '/mediation-page', query: {sourcePage: 'home', caseId: row.caseId}})
+                this.$router.push({path: '/mediation-page', query: {sourcePage: 'home'}})
             }
         }
     };

src/pages/mediation-page/components/MediationRecordDialog.vue

@@ -256,6 +256,7 @@ export default {
     handleUploadFile(fileList){
       console.log('获取上传文件信息',fileList)
       fileList = JSON.parse(JSON.stringify(fileList))
+      
       this.fileList = fileList.map((item,i) => {
         return {
           url: item.url,
@@ -264,8 +265,8 @@ export default {
           objectName: item.objectName
         }
       })
-      // this.repaymentObj.url = this.fileList.length?this.fileList[0].fileName : '';
-      // this.repaymentObj.name = this.fileList.length?this.fileList[0].objectName : '';
+      console.log(this.fileList ,'fileListfileListfileList')
+
     },
     handleClose() {
       this.$emit('update:visiblemediatRecord', false)

src/pages/mediation-page/components/caseFileDialog.vue

@@ -31,7 +31,7 @@
             <el-form-item label="上传要求:">
               <div style="line-height: 20px;padding-top: 10px">
                 <div>请知悉！</div>
-                <div>请上传图片或pdf材料，单个文件需要在0KB以上，50MB以内;文件名称中请勿包含换行符、空格、tab#&V:?"#*|&"<>%+'等特色字符。</div>
+                <div>请上传图片或pdf材料，单个文件需要在0KB以上，50MB以内;文件名称中请勿包含换行符、空格、tab&V:?"#*|&"<>%+'等特色字符。</div>
                 <div>文件名称不超过45个字</div>
               </div>
             </el-form-item>
@@ -108,9 +108,14 @@ export default {
           objectName: item.objectName
         }
       })
-      this.repaymentObj.url = this.fileList.length?this.fileList[0].fileName : '';
       this.repaymentObj.name = this.fileList.length?this.fileList[0].objectName : '';
-      // console.log(this.repaymentObj, '---this.repaymentObj', this.fileList)
+      if (!this.$verify.specialChar(this.repaymentObj.name)) {
+        this.$message.error('文件名称包含非法字符，请重新上传！')
+        return false
+      }
+      this.repaymentObj.url = this.fileList.length?this.fileList[0].fileName : '';
+      
+      console.log(this.repaymentObj, '---this.repaymentObj', this.fileList)
     },
     handleClose() {
       this.$emit('update:eventDialog', null)