解决冲突更改

src/views/caseManagement/components/addCase.vue

@@ -135,7 +135,8 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="选择机构或自然人">
-                <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag" @change="clearValidate($event,index)">
+                <el-radio-group v-model="item.applicant.organizeFlag" :disabled="modelFlag"
+                  @change="clearValidate($event, index)">
                   <el-radio :label="0">自然人</el-radio>
                   <el-radio :label="1">机构</el-radio>
                 </el-radio-group>
@@ -423,7 +424,8 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="选择机构或自然人">
-                <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag" @change="clearValidateRes($event,index)">
+                <el-radio-group v-model="item.res.organizeFlag" :disabled="modelFlag"
+                  @change="clearValidateRes($event, index)">
                   <el-radio :label="0">自然人</el-radio>
                   <el-radio :label="1">机构</el-radio>
                 </el-radio-group>
@@ -547,8 +549,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="item.res.organizeFlag == 0">
-              <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'"
+              <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" :rules="[
-                :rules="[
       {
         required: true,
         message: '被申请人身份证号不能为空',
@@ -1237,12 +1238,18 @@ export default {
               // this.$set(item,"organizeFlag",0);
               // this.$set(item,"roleType",2)
               item.applicantAgent.organizeFlag = 0;
+              if (item.applicantAgent == null || item.applicantAgent == undefined) {
+                item["applicantAgent"] = {}
+              }
               item.applicantAgent['roleType'] = 2;
             })
             this.formData.affiliate.res.forEach((item) => {
               // this.$set(item,"organizeFlag",0);
               // this.$set(item,"roleType",4)
               item.resAgent.organizeFlag = 0;
+              if (item.resAgent == null || item.resAgent == undefined) {
+                item["resAgent"] = {}
+              }
               item.resAgent['roleType'] = 4;
             })
             this.modifyData(this.formData);

src/views/caseManagement/components/mediation.vue

@@ -168,6 +168,7 @@ export default {
       },
       filedata: {
         annexType: 7,
+        isMediaBook:1,
       },
       fileList: [],
       attachList: [],
@@ -217,7 +218,7 @@ export default {
     },
     /**上传地址*/
     UploadUrl() {
-      return window.location.origin + "/API/common/upload";
+      return window.location.origin + "/API/video/upload";
     },
     handlePreview(file) {
     },