Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

src/views/caseManagement/components/addCase.vue

@@ -1232,6 +1232,18 @@ export default {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.addModifyData == 3) {
+            this.formData.affiliate.applicant.forEach((item) => {
+              // this.$set(item,"organizeFlag",0);
+              // this.$set(item,"roleType",2)
+              item.applicantAgent.organizeFlag = 0;
+              item.applicantAgent.roleType = 2;
+            })
+            this.formData.affiliate.res.forEach((item) => {
+              // this.$set(item,"organizeFlag",0);
+              // this.$set(item,"roleType",4)
+              item.resAgent.organizeFlag = 0;
+              item.applicantAgent.roleType = 4;
+            })
             this.modifyData(this.formData);
           } else if (this.addModifyData == 1) {
             this.insertFn(this.formData);

src/views/caseManagement/components/mediation.vue

@@ -98,12 +98,12 @@
         <!-- v-if="!mediationType" -->
         <el-col :span="24">
           <el-form-item label="上传调解书">
-            <el-upload class="upload-demo" accept=".doc,.docx" ref="upload" :action="UploadUrl()"
+            <el-upload class="upload-demo" accept=".doc,.docx,.pdf" ref="upload" :action="UploadUrl()"
-              :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="1"
+              :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="2"
               :on-change="beforeUpload" :on-success="handlSuccess" :file-list="fileList">
               <el-button slot="trigger" size="small" :disabled="!isSecretaryRole" type="primary">选取文件</el-button>
               <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
-              <div slot="tip" class="el-upload__tip">只能上传.doc，docx文件</div>
+              <div slot="tip" class="el-upload__tip">只能上传.doc，docx，pdf文件</div>
             </el-upload>
           </el-form-item>
         </el-col>
@@ -178,6 +178,7 @@ export default {
   },
   watch: {
     mediationVisable(val) {
+      this.attachList = [];
       this.formData.mediaResult = 1;
       this.formData.sealFlag = 1;
       this.recordArr = [];
@@ -221,7 +222,8 @@ export default {
     handlePreview(file) {
     },
     handleRemove(file, fileList) {
-
+      let updatedArray = this.attachList.filter(item => item.annexId != file.response.annexId);
+      this.attachList = updatedArray;
     },
     beforeUpload(flie, fileList) {
       this.fileList = fileList;
@@ -229,7 +231,7 @@ export default {
     handlSuccess(res, file) {
       this.codes = res.code
       console.log(res)
-      this.attachList = [{ annexId: res.annexId,annexType:res.annexType}];
+      this.attachList.push({ annexId: res.annexId,annexType:res.annexType});
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
     /** 获取案件详情信息 */
@@ -319,6 +321,8 @@ export default {
         this.$emit("cancelMediation");
         this.$emit("getList", this.queryParams);
         this.loadingSubmit = false;
+      }).catch(err=>{
+        this.loadingSubmit = false;
       });
     },
     cancel() {
@@ -352,6 +356,7 @@ export default {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
           sealFlag:this.sealFlag,
+          attachList: this.attachList,
           mediaResult: this.formData.mediaResult,
         }
       }