解决冲突更改

src/views/caseManagement/components/addCase.vue

@@ -88,7 +88,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="modelFlag&&labelShowMediate">
+          <el-col :span="24" v-if="modelFlag && labelShowMediate">
             <el-form-item label="调解后调解书:">
               <div v-for="(item, index) in formData.caseAttachList" :key="index" v-if="item.annexType == 13">
                 <div style="color: blue; cursor: pointer" @click="fileDetil(item.annexPath, 1)">
@@ -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>
@@ -405,7 +406,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="buttonFlag">
-              <el-button v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
+              <el-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
                 @click='deleteApplicant(item)'>删除</el-button>
             </el-col>
           </div>
@@ -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'"
-                :rules="[
+              <el-form-item label-width="140px" label="身份证号" :prop="'affiliate.res.' + index + '.res.idCard'" :rules="[
       {
         required: true,
         message: '被申请人身份证号不能为空',
@@ -694,7 +695,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="buttonFlag">
-              <el-button  v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
+              <el-button v-if="index >= 1 ? true : false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
                 @click='deleteRes(item)'>删除</el-button>
             </el-col>
           </div>
@@ -870,7 +871,7 @@ export default {
       getUserInfoList: {},
       applicationFlag: null,
       showmediate: false,
-      labelShowMediate:false,
+      labelShowMediate: false,
       showEvidence: false,//是否显示证据
       mediationApplication: false,
       formZipData: {},
@@ -1098,7 +1099,7 @@ export default {
             this.showmediate = true
           } else if (item.annexType == 3) {
             this.mediationApplication = true
-          } else if(item.annexType == 13){
+          } else if (item.annexType == 13) {
             this.labelShowMediate = true
           }
         });
@@ -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);
@@ -1252,8 +1259,8 @@ export default {
         }
       });
     },
-    clearValidate(val,index) {
-     if(index==0){
+    clearValidate(val, index) {
+      if (index == 0) {
         if (val == 0) {
           this.$set(this.formData.affiliate.applicant[0].applicant, "name", this.getUserInfoList.nickName);
           this.$set(this.formData.affiliate.applicant[0].applicant, "idCard", this.getUserInfoList.idCard);
@@ -1316,8 +1323,8 @@ export default {
 
       this.$refs["ruleForm"].clearValidate()
     },
-    clearValidateRes(val,index) {
-      if(index==0){
+    clearValidateRes(val, index) {
+      if (index == 0) {
         if (val == 0) {
           if (this.formZipData.affiliate) {
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);

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) {
     },