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

src/views/caseManagement/components/addCase.vue

@@ -601,8 +601,8 @@
       },
     ]">
                 <el-radio-group v-model="item.res.sex" disabled>
-                  <el-radio :label="'0'">男</el-radio>
-                  <el-radio :label="'1'">女</el-radio>
+                  <el-radio label="0">男</el-radio>
+                  <el-radio label="1">女</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -1334,23 +1334,26 @@ export default {
     clearValidateRes(val, index) {
       if (index == 0) {
         if (val == 0) {
+        console.log(this.formData.affiliate.res[0].res.sex)
+         this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex); 
           if (this.formZipData.affiliate) {
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
-            this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
+            this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
           }
         } else if (val == 1) {
+        console.log(this.formData.affiliate.res[0].res.sex)
           if (this.formZipData.affiliate) {
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
-            this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
+            this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);

src/views/caseManagement/components/mediation.vue

@@ -170,6 +170,7 @@ export default {
       filedata: {
         annexType: 7,
         isMediaBook: 1,
+        caseId:null
       },
       fileList: [],
       attachList: [],
@@ -228,12 +229,15 @@ export default {
       this.attachList = updatedArray;
     },
     beforeUpload(flie, fileList) {
+      this.filedata.caseId =  this.mediationData.id
+  
       this.fileList = fileList;
     },
     handlSuccess(res, file) {
+      const fileSuccess = [{ annexId: res.annexId, annexType: res.annexType,annexName:res.newFileName,annexPath:res.fileName,onlyOfficeFileId:res.onlyOfficeFileId}]
       this.codes = res.code
-      console.log(res)
       this.attachList.push({ annexId: res.annexId, annexType: res.annexType });
+      this.recordArrMediate = fileSuccess;
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
     /** 获取案件详情信息 */
@@ -259,6 +263,7 @@ export default {
             this.recordArrMediate.push(item);
           }
         });
+        
       });
     },
     /** 获取用户信息 */