冲突解决

src/views/caseManagement/caseList.vue

                         @keyup.enter.native="handleQuery"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="批号" prop="batchNumber">
+            <!-- <el-form-item label="批号" prop="batchNumber">
                 <el-input v-model="queryParams.batchNumber" placeholder="请输入案件批号" clearable style="width: 240px"
                     @keyup.enter.native="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="案件编号" prop="caseNum">
                 <el-input v-model="queryParams.caseNum" placeholder="请输入案件编号" clearable style="width: 240px"
                     @keyup.enter.native="handleQuery" />
                     }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" />
+            <!-- <el-table-column label="批号" align="center" prop="batchNumber" :show-overflow-tooltip="true" /> -->
             <el-table-column label="案件编号" align="center" prop="caseNum" :show-overflow-tooltip="true" />
             <el-table-column label="申请人" align="center" prop="applicationName" :show-overflow-tooltip="true" />
             <el-table-column label="被申请人" align="center" prop="respondentName" :show-overflow-tooltip="true" />

src/views/caseManagement/components/addCase.vue

                         </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: '申请机构名称不能为空',
                             <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,
                             <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="[
                             {
         return {
             activeName: 'first',
             title: "新增案件",
+            organizeFlag:0,//选择机构和自然人
             formData: {
                 affiliate: {
                     respondentSex: 0

src/views/caseManagement/components/confirmMediation.vue

                     </div>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否和解:" prop="isReconci">
+                  <el-radio-group v-model="isReconci">
+                      <el-radio :label="1">是</el-radio>
+                      <el-radio :label="0">否</el-radio>
+                  </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
         <div class="payupload">
           <span>上传修改后调解书</span>
     return {
       fileList: [],
       formData: {
-        affiliate: {}
+        affiliate: {},
+        
       },
+      isReconci:0,
       fileURL: window.location.origin + "/API",
       annexId:null,
       headers: {
       confirmMediation({
         caseAppliId: this.confirmTionData.id,
         caseFlowId: this.confirmTionData.caseFlowId,
-        annexId: this.annexId
+        annexId: this.annexId,
+        isReconci:this.isReconci,
       }).then(res => {
         this.$modal.msgSuccess("成功");
         this.cancel();

src/views/login.vue

 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">调解管理系统</h3>
+      <h3 class="title">智慧调解系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

src/views/officialSeal/officialSealList.vue

                     }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="仲裁机构名称" align="center" prop="identifyName" :show-overflow-tooltip="true" />
+            <el-table-column label="调解机构名称" align="center" prop="identifyName" :show-overflow-tooltip="true" />
             <el-table-column label="经办人姓名" align="center" prop="operName" :show-overflow-tooltip="true" />
             <el-table-column label="经办人手机号" align="center" prop="operPhone" :show-overflow-tooltip="true" />
             <el-table-column label="认证时间" align="center" prop="identifyDate" />

src/views/officialSeal/templateManagement.vue

                     }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="仲裁机构名称" align="center" prop="identifyName" :show-overflow-tooltip="true" />
+            <el-table-column label="调解机构名称" align="center" prop="identifyName" :show-overflow-tooltip="true" />
             <el-table-column label="调解书名称" align="center" prop="temName" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">