Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

src/views/caseManagement/components/addCase.vue

@@ -115,11 +115,11 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
-                            <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
-                                <el-radio :label="0">自然人</el-radio>
-                                <el-radio :label="1">机构</el-radio>
-                            </el-radio-group>
-               </el-form-item>
+              <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
+                <el-radio :label="0">自然人</el-radio>
+                <el-radio :label="1">机构</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="申请机构名称" prop="affiliate.applicationName" :rules="[
@@ -133,14 +133,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item label="申请人" prop="affiliate.applicationName1" :rules="[
+            <el-form-item label="申请人" prop="affiliate.applicationName" :rules="[
               {
                 required: true,
                 message: '申请人名称不能为空',
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.applicationName1" placeholder="请输入申请机构名称" />
+              <el-input v-model="formData.affiliate.applicationName" placeholder="请输入申请机构名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
@@ -497,17 +497,18 @@ export default {
       } else if (val == 3) {
         this.title = "修改案件";
         this.modelFlag = true;
-        this.caseApplicationSelectByIdFn(this.caseData.id);
       } else if (val == 2) {
         this.title = "案件详情";
         this.modelFlag = true;
-        this.caseApplicationSelectByIdFn(this.caseData.id);
       }
     },
     addVisable(val) {
       if (val) {
         this.activeName = "first";
         this.getTemplateFn();
+        if (this.addModifyData != 1) {
+          this.caseApplicationSelectByIdFn(this.caseData.id);
+        }
       }
     },
   },
@@ -610,7 +611,7 @@ export default {
         }
       });
     },
-    clearValidate(){
+    clearValidate() {
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {