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

src/views/caseManagement/components/addCase.vue

@@ -385,44 +385,7 @@
               <el-input v-model="formData.affiliate.respondentPhone" placeholder="请输入被申请人联系电话" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+                    <el-col :span="12">
-            <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :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.respondentIdentityNum" @blur="handleBlur"
-                placeholder="请输入被申请人身份证号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
-      {
-        required: true,
-        message: '请选择性别',
-      },
-    ]">
-              <el-radio-group v-model="formData.affiliate.respondentSex" disabled>
-                <el-radio :label="0">男</el-radio>
-                <el-radio :label="1">女</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
-              <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
             <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
       {
         required: true,
@@ -437,7 +400,7 @@
             <el-form-item label="被申请人邮箱" prop="affiliate.respondentEmail" :rules="[
       {
         required: true,
-        message: '代理人邮箱不能为空',
+        message: '被申请人邮箱不能为空',
         trigger: 'blur',
       },
       {
@@ -451,6 +414,43 @@
             </el-form-item>
           </el-col>
         </el-row>
+              <el-col :span="12">
+                <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :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.respondentIdentityNum" @blur="handleBlur"
+                placeholder="请输入被申请人身份证号" />
+            </el-form-item>
+            </el-col>
+                      <el-col :span="12">
+              <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
+                <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
+              {
+                required: true,
+                message: '请选择性别',
+              },
+            ]">
+              <el-radio-group v-model="formData.affiliate.respondentSex" disabled>
+                <el-radio :label="0">男</el-radio>
+                <el-radio :label="1">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         <el-col :span="24" v-if="modelFlag">
           <el-form-item v-for="item in formData.columnValueList" :label="item.name" :key="item.id">
             <el-input type="textarea" v-model="item.value"></el-input>
@@ -826,7 +826,8 @@ export default {
   height: 700px !important;
   overflow: auto !important;
 }
-::v-deep .el-form-item--medium .el-form-item__content {
+::v-deep .el-input--medium .el-input__inner{
-    line-height: 37px;
+  height: 40px;
+  line-height: 40px;
 }
 </style>