From 133f404bd19ec5bcd25385af70c7992b5812900d Mon Sep 17 00:00:00 2001
From: gyj <gaoyj@aliyun.com>
Date: Tue, 30 Jan 2024 09:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E6=85=A7=E8=B0=83=E8=A7=A3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/caseManagement/caseList.vue         |  6 +--
 .../caseManagement/components/addCase.vue     | 41 ++++++++++++++++++-
 .../components/confirmMediation.vue           | 15 ++++++-
 src/views/login.vue                           |  2 +-
 src/views/officialSeal/officialSealList.vue   |  2 +-
 src/views/officialSeal/templateManagement.vue |  2 +-
 6 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue
index 4d9fe85..6bf49fe 100644
--- a/src/views/caseManagement/caseList.vue
+++ b/src/views/caseManagement/caseList.vue
@@ -13,10 +13,10 @@
                         @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" />
@@ -48,7 +48,7 @@
                     }}</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="applicationOrganName" :show-overflow-tooltip="true" />
             <el-table-column label="被申请人" align="center" prop="respondentName" :show-overflow-tooltip="true" />
diff --git a/src/views/caseManagement/components/addCase.vue b/src/views/caseManagement/components/addCase.vue
index 86bd7b3..b797147 100644
--- a/src/views/caseManagement/components/addCase.vue
+++ b/src/views/caseManagement/components/addCase.vue
@@ -114,7 +114,15 @@
                         </div>
                         <el-divider></el-divider>
                     </el-col>
-                    <el-col :span="12">
+                    <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,
@@ -125,7 +133,18 @@
                             <el-input v-model="formData.affiliate.applicationOrganName" 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
diff --git a/src/views/caseManagement/components/confirmMediation.vue b/src/views/caseManagement/components/confirmMediation.vue
index d2e5eb8..a5cdf9f 100644
--- a/src/views/caseManagement/components/confirmMediation.vue
+++ b/src/views/caseManagement/components/confirmMediation.vue
@@ -55,6 +55,14 @@
                     </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>
@@ -100,8 +108,10 @@ export default {
     return {
       fileList: [],
       formData: {
-        affiliate: {}
+        affiliate: {},
+        
       },
+      isReconci:0,
       fileURL: window.location.origin + "/API",
       annexId:null,
       headers: {
@@ -137,7 +147,8 @@ export default {
       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();
diff --git a/src/views/login.vue b/src/views/login.vue
index 94745ee..ae474c5 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
 <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"
diff --git a/src/views/officialSeal/officialSealList.vue b/src/views/officialSeal/officialSealList.vue
index fdc6e51..fc91dd2 100644
--- a/src/views/officialSeal/officialSealList.vue
+++ b/src/views/officialSeal/officialSealList.vue
@@ -14,7 +14,7 @@
                     }}</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" />
diff --git a/src/views/officialSeal/templateManagement.vue b/src/views/officialSeal/templateManagement.vue
index 1f456ee..26ed049 100644
--- a/src/views/officialSeal/templateManagement.vue
+++ b/src/views/officialSeal/templateManagement.vue
@@ -14,7 +14,7 @@
                     }}</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">