冲突解决

src/views/caseManagement/components/addCase.vue

@@ -114,8 +114,16 @@
                         </div>
                         <el-divider></el-divider>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="申请机构名称" prop="affiliate.applicationName" :rules="[
+                    <el-col :span="24">
+                        <el-form-item label="选择机构或自然人">
+                            <el-radio-group v-model="organizeFlag">
+                                <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="organizeFlag==1">
+                        <el-form-item label="申请机构名称" prop="affiliate.applicationOrganName" :rules="[
                             {
                                 required: true,
                                 message: '申请机构名称不能为空',
@@ -125,7 +133,18 @@
                             <el-input v-model="formData.affiliate.applicationName" placeholder="请输入申请机构名称" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="12" v-if="organizeFlag==0">
+                        <el-form-item label="申请人" prop="affiliate.applicationOrganName" :rules="[
+                            {
+                                required: true,
+                                message: '申请人名称不能为空',
+                                trigger: 'blur',
+                            },
+                        ]">
+                            <el-input v-model="formData.affiliate.applicationOrganName" placeholder="请输入申请机构名称" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12" v-if="organizeFlag==1">
                         <el-form-item label="统一社会信用代码" prop="affiliate.creditCode" :rules="[
                             {
                                 required: true,
@@ -136,6 +155,23 @@
                             <el-input v-model="formData.affiliate.creditCode" placeholder="请输入统一社会信用代码" />
                         </el-form-item>
                     </el-col>
+                    <el-col :span="12" v-if="organizeFlag==0">
+                        <el-form-item label="申请人身份证号码" prop="affiliate.creditCode" :rules="[
+                            {
+                                required: true,
+                                message: '申请人身份证号不能为空',
+                                trigger: 'blur',
+                            },
+                            {
+                                pattern:
+                                    /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+                                message: '请输入正确的身份证号码',
+                                trigger: 'blur',
+                            },
+                        ]">
+                            <el-input v-model="formData.affiliate.creditCode" placeholder="请输入申请人的身份证号" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="12">
                         <el-form-item label="法定代表人" prop="affiliate.compLegalPerson" :rules="[
                             {
@@ -369,6 +405,7 @@ export default {
         return {
             activeName: 'first',
             title: "新增案件",
+            organizeFlag:0,//选择机构和自然人
             formData: {
                 affiliate: {
                     respondentSex: 0